diff options
author | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
commit | bd054b84533305420e368fae85921e43c2382c78 (patch) | |
tree | 3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/GameEventMgr.cpp | |
parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameEventMgr.cpp')
-rw-r--r-- | src/game/GameEventMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index b96fab9ab8b..0984c896eac 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -1228,7 +1228,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) objmgr.AddCreatureToGrid(*itr, data); // Spawn if necessary (loaded grids only) - Map* map = const_cast<Map*>(MapManager::Instance().GetBaseMap(data->mapid)); + Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid)); // We use spawn coords to spawn if(!map->Instanceable() && !map->IsRemovalGrid(data->posX,data->posY)) { @@ -1261,7 +1261,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) objmgr.AddGameobjectToGrid(*itr, data); // Spawn if necessary (loaded grids only) // this base map checked as non-instanced and then only existed - Map* map = const_cast<Map*>(MapManager::Instance().GetBaseMap(data->mapid)); + Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid)); // We use current coords to unspawn, not spawn coords since creature can have changed grid if(!map->Instanceable() && !map->IsRemovalGrid(data->posX, data->posY)) { |