From 904d8aa0401d0076a43f712aff12ae46d12d99fe Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 7 Jan 2025 19:40:20 +0100 Subject: Core/Misc: Removed GetClassName preprocessor hack (cherry picked from commit 6f0e96a30aeafdd2bff31c4f811b3f95f17fb3c5) --- src/server/scripts/Commands/cs_misc.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/server/scripts') 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 contextBonuses = ItemBonusMgr::GetBonusListsForItem(itemId, itemContext); bonusListIDs.insert(bonusListIDs.begin(), contextBonuses.begin(), contextBonuses.end()); std::ranges::sort(bonusListIDs); - std::ranges::borrowed_subrange_t&> 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 -- cgit v1.2.3