From 1deb7d2df178a98bc1b1cde2ca99301e7ee85ecb Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 20 Aug 2016 21:40:43 -0300 Subject: Core/Battlefield: Cleanup of Wintergrasp script and battlefield system: - Standards: Moved all statics to cpps where they belong. - Changed spawn position container from fixed size array to std::vector (not all positions were used in every case) - Removed unused parameter teamId from Battlefield::SpawnCreature - Removed workaround for GO rotation, added in a69cbeb9d5776025452009733f13ff3a631315e8 - Added rotation parameter to Battlefield:SpawnGameObject - Added sniffed rotation to existing script spawns. - Implemented Archavon's Log (Closes #16880) --- src/server/game/Battlefield/BattlefieldMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Battlefield/BattlefieldMgr.cpp') diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index 1df87fe1d6f..8eae2f2d9d0 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -109,11 +109,11 @@ Battlefield* BattlefieldMgr::GetBattlefieldToZoneId(uint32 zoneId) if (itr == _battlefieldMap.end()) { // no handle for this zone, return - return NULL; + return nullptr; } if (!itr->second->IsEnabled()) - return NULL; + return nullptr; return itr->second; } @@ -125,7 +125,7 @@ Battlefield* BattlefieldMgr::GetBattlefieldByBattleId(uint32 battleId) if ((*itr)->GetBattleId() == battleId) return *itr; } - return NULL; + return nullptr; } ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId) @@ -134,7 +134,7 @@ ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId) if (itr != _battlefieldMap.end()) return itr->second; - return NULL; + return nullptr; } void BattlefieldMgr::Update(uint32 diff) -- cgit v1.2.3