diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-18 21:21:17 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-18 21:21:17 +0200 |
| commit | 5daf3d360686ea8ff2d97a48fca24f0bf42ef098 (patch) | |
| tree | 8d93a77dcf7fb0c7953499623dd1cf1dada9a92c /src/server | |
| parent | dd64f77dccf9cfabbfb84a3c15a7e676ead6836c (diff) | |
| parent | 3249986ba8d49108cc3b58a2db092ab940480ebf (diff) | |
Merge branch 'master' into 4.3.4
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Battlegrounds/Battleground.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/Battleground.h | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 73dc69ecffa..f03f1474517 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -595,7 +595,7 @@ inline void Battleground::_ProcessLeave(uint32 diff) } } -inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const +Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const { Player* player = NULL; if (!offlineRemove) @@ -608,17 +608,7 @@ inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char co return player; } -inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::iterator itr, char const* context) -{ - return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); -} - -inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::const_iterator itr, char const* context) const -{ - return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); -} - -inline Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const +Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const { Player* player = _GetPlayer(itr, context); if (player) diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 214a9cd7645..a67be38be05 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -481,8 +481,8 @@ class Battleground void PlayerAddedToBGCheckIfBGIsRunning(Player* player); Player* _GetPlayer(uint64 guid, bool offlineRemove, const char* context) const; - Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context); - Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const; + Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context) { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); } + Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); } Player* _GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, const char* context) const; void _ProcessOfflineQueue(); |