diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2023-12-29 14:12:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 14:12:15 +0100 |
| commit | 1ef0c045202a6af33fb991f2ff765fa183ce976f (patch) | |
| tree | 4a2744ed72b4e66935341c4d1ee3b01e5d80f0e1 /src/server/game/Cache | |
| parent | fb64d7fe8efe5ecba40123cdc96195d3ca52d7c0 (diff) | |
Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types (#29535)
* Fix criteria data type bg loss team score
Diffstat (limited to 'src/server/game/Cache')
| -rw-r--r-- | src/server/game/Cache/CharacterCache.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Cache/CharacterCache.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index 2e2d5677236..20b0e1ffd9d 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -243,11 +243,11 @@ bool CharacterCache::GetCharacterNameByGuid(ObjectGuid guid, std::string& name) return true; } -uint32 CharacterCache::GetCharacterTeamByGuid(ObjectGuid guid) const +Team CharacterCache::GetCharacterTeamByGuid(ObjectGuid guid) const { auto itr = _characterCacheStore.find(guid); if (itr == _characterCacheStore.end()) - return 0; + return TEAM_OTHER; return Player::TeamForRace(itr->second.Race); } diff --git a/src/server/game/Cache/CharacterCache.h b/src/server/game/Cache/CharacterCache.h index 74feef11e35..186ffa1474c 100644 --- a/src/server/game/Cache/CharacterCache.h +++ b/src/server/game/Cache/CharacterCache.h @@ -21,6 +21,7 @@ #include "Define.h" #include "ObjectGuid.h" #include "Optional.h" +#include "SharedDefines.h" #include <string> struct CharacterCacheEntry @@ -62,7 +63,7 @@ class TC_GAME_API CharacterCache ObjectGuid GetCharacterGuidByName(std::string const& name) const; bool GetCharacterNameByGuid(ObjectGuid guid, std::string& name) const; - uint32 GetCharacterTeamByGuid(ObjectGuid guid) const; + Team GetCharacterTeamByGuid(ObjectGuid guid) const; uint32 GetCharacterAccountIdByGuid(ObjectGuid guid) const; uint32 GetCharacterAccountIdByName(std::string const& name) const; uint8 GetCharacterLevelByGuid(ObjectGuid guid) const; |