diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-01-07 19:40:20 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-01-09 20:53:38 +0100 |
| commit | 904d8aa0401d0076a43f712aff12ae46d12d99fe (patch) | |
| tree | 6711237e33fdba5b5f14e0f9e839f6e49acef52f /src/server/scripts | |
| parent | 4e7181c1716da4292456f158f0fee39a1c2b02ad (diff) | |
Core/Misc: Removed GetClassName preprocessor hack
(cherry picked from commit 6f0e96a30aeafdd2bff31c4f811b3f95f17fb3c5)
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index c9ea07ee4e1..bf8b23f2e7c 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -50,11 +50,6 @@ #include "World.h" #include "WorldSession.h" -// temporary hack until includes are sorted out (don't want to pull in Windows.h) -#ifdef GetClassName -#undef GetClassName -#endif - #if TRINITY_COMPILER == TRINITY_COMPILER_GNU #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif @@ -1212,8 +1207,7 @@ public: std::vector<int32> contextBonuses = ItemBonusMgr::GetBonusListsForItem(itemId, itemContext); bonusListIDs.insert(bonusListIDs.begin(), contextBonuses.begin(), contextBonuses.end()); std::ranges::sort(bonusListIDs); - std::ranges::borrowed_subrange_t<std::vector<int>&> removed = std::ranges::unique(bonusListIDs); - bonusListIDs.erase(removed.begin(), removed.end()); + bonusListIDs.erase(std::unique(bonusListIDs.begin(), bonusListIDs.end()), bonusListIDs.end()); } } @@ -1767,7 +1761,7 @@ public: // Output XI. LANG_PINFO_CHR_RACE raceStr = DB2Manager::GetChrRaceName(raceid, locale); - classStr = DB2Manager::GetClassName(classid, locale); + classStr = DB2Manager::GetChrClassName(classid, locale); handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetTrinityString(LANG_CHARACTER_GENDER_MALE) : handler->GetTrinityString(LANG_CHARACTER_GENDER_FEMALE)), raceStr.c_str(), classStr.c_str()); // Output XII. LANG_PINFO_CHR_ALIVE |