aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectMgr.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-06-16 18:40:57 +0200
committerMachiavelli <none@none>2009-06-16 18:40:57 +0200
commitbd054b84533305420e368fae85921e43c2382c78 (patch)
tree3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/ObjectMgr.cpp
parente6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff)
parent560ca5a2102a082f6712e1a3ec58f9f367532ade (diff)
*Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r--src/game/ObjectMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 867da4401d3..682c91a1f3b 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -1405,7 +1405,7 @@ uint32 ObjectMgr::AddGameObject(uint32 entry, uint32 mapId, float x, float y, fl
AddGameobjectToGrid(guid, &data);
// Spawn if necessary (loaded grids only)
- if(Map* map = const_cast<Map*>(MapManager::Instance().GetBaseMap(mapId)))
+ if(Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId)))
{
// We use spawn coords to spawn
if(!map->Instanceable() && !map->IsRemovalGrid(x, y))
@@ -1454,7 +1454,7 @@ uint32 ObjectMgr::AddCreature(uint32 entry, uint32 team, uint32 mapId, float x,
AddCreatureToGrid(guid, &data);
// Spawn if necessary (loaded grids only)
- if(Map* map = const_cast<Map*>(MapManager::Instance().GetBaseMap(mapId)))
+ if(Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId)))
{
// We use spawn coords to spawn
if(!map->Instanceable() && !map->IsRemovalGrid(x, y))