Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Removed GetClassName preprocessor hack

Browse Source 
(cherry picked from commit 6f0e96a30a)
This commit is contained in:
Shauren
2025-01-07 19:40:20 +01:00
committed by Ovahlord
parent 4e7181c171
commit 904d8aa040
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -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