diff options
| author | Rat <gmstreetrat@gmail.com> | 2011-11-23 20:23:04 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2011-11-23 20:23:04 +0100 |
| commit | 47d0a7f3afbb25d26dec8721801b13d4392aaf1d (patch) | |
| tree | 86b1d2c876d67fd855ac67d875210df4cdb95b43 /src/server/game/Pools/PoolMgr.cpp | |
| parent | 47e28a7576d089552bc3ebf3dddcb6d9bf3e69f6 (diff) | |
| parent | 0eb193f2b416af7f34bd89641aec88d843c9197e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCfmt.h
src/server/game/Server/Protocol/Opcodes.cpp
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
| -rwxr-xr-x | src/server/game/Pools/PoolMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index bbef60aa5e7..bd8840ff8a8 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -359,7 +359,7 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj) sObjectMgr->AddCreatureToGrid(obj->guid, data); // Spawn if necessary (loaded grids only) - Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(data->mapid)); + Map* map = sMapMgr->CreateBaseMap(data->mapid); // We use spawn coords to spawn if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) { @@ -385,7 +385,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj) sObjectMgr->AddGameobjectToGrid(obj->guid, data); // Spawn if necessary (loaded grids only) // this base map checked as non-instanced and then only existed - Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(data->mapid)); + Map* map = sMapMgr->CreateBaseMap(data->mapid); // We use current coords to unspawn, not spawn coords since creature can have changed grid if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) { |