aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlefield/BattlefieldMgr.cpp
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-20 21:40:43 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-12 16:50:06 +0100
commit0925c350e765ce944186d4ba6e30dd6c3063abba (patch)
treea113bbc6fd2f4c33cce5fd20183be89bc5963326 /src/server/game/Battlefield/BattlefieldMgr.cpp
parent7616f22bfb44af507191b9652825c548d1ac9713 (diff)
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) (cherry picked from commit 1deb7d2df178a98bc1b1cde2ca99301e7ee85ecb)
Diffstat (limited to 'src/server/game/Battlefield/BattlefieldMgr.cpp')
-rw-r--r--src/server/game/Battlefield/BattlefieldMgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp
index 8be0a1e5ee0..b66d42dc521 100644
--- a/src/server/game/Battlefield/BattlefieldMgr.cpp
+++ b/src/server/game/Battlefield/BattlefieldMgr.cpp
@@ -107,11 +107,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;
}
@@ -123,7 +123,7 @@ Battlefield* BattlefieldMgr::GetBattlefieldByBattleId(uint32 battleId)
if ((*itr)->GetBattleId() == battleId)
return *itr;
}
- return NULL;
+ return nullptr;
}
Battlefield* BattlefieldMgr::GetBattlefieldByQueueId(uint64 queueId)
@@ -141,7 +141,7 @@ ZoneScript* BattlefieldMgr::GetZoneScript(uint32 zoneId)
if (itr != _battlefieldMap.end())
return itr->second;
- return NULL;
+ return nullptr;
}
void BattlefieldMgr::Update(uint32 diff)