aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapInstanced.cpp
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2010-08-08 04:37:24 +0200
committerXTZGZoReX <none@none>2010-08-08 04:37:24 +0200
commit909e33257911cec50284b513742d3d92d12260e3 (patch)
treee67dd1ab4cf548d8d25d79695a90c97450305961 /src/server/game/Maps/MapInstanced.cpp
parent3d1efa6ed75f12d4432b0ce687f8981469e6d7e4 (diff)
* Rename: BattleGround -> Battleground.
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Maps/MapInstanced.cpp')
-rw-r--r--src/server/game/Maps/MapInstanced.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index c83e5b4f805..7ee0a9cbf1d 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -21,7 +21,7 @@
#include "MapInstanced.h"
#include "ObjectMgr.h"
#include "MapManager.h"
-#include "BattleGround.h"
+#include "Battleground.h"
#include "VMapFactory.h"
#include "InstanceSaveMgr.h"
#include "World.h"
@@ -116,15 +116,15 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
Map* map = NULL;
uint32 NewInstanceId = 0; // instanceId of the resulting map
- if (IsBattleGroundOrArena())
+ if (IsBattlegroundOrArena())
{
// instantiate or find existing bg map for player
// the instance id is set in battlegroundid
- NewInstanceId = player->GetBattleGroundId();
+ NewInstanceId = player->GetBattlegroundId();
if (!NewInstanceId) return NULL;
map = _FindMap(NewInstanceId);
if (!map)
- map = CreateBattleGround(NewInstanceId, player->GetBattleGround());
+ map = CreateBattleground(NewInstanceId, player->GetBattleground());
}
else
{
@@ -202,19 +202,19 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
return map;
}
-BattleGroundMap* MapInstanced::CreateBattleGround(uint32 InstanceId, BattleGround* bg)
+BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battleground* bg)
{
// load/create a map
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
- sLog.outDebug("MapInstanced::CreateBattleGround: map bg %d for %d created.", InstanceId, GetId());
+ sLog.outDebug("MapInstanced::CreateBattleground: map bg %d for %d created.", InstanceId, GetId());
PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel());
uint8 spawnMode = bracketEntry ? bracketEntry->difficulty : REGULAR_DIFFICULTY;
- BattleGroundMap *map = new BattleGroundMap(GetId(), GetGridExpiry(), InstanceId, this, spawnMode);
- ASSERT(map->IsBattleGroundOrArena());
+ BattlegroundMap *map = new BattlegroundMap(GetId(), GetGridExpiry(), InstanceId, this, spawnMode);
+ ASSERT(map->IsBattlegroundOrArena());
map->SetBG(bg);
bg->SetBgMap(map);