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/Globals/ObjectMgr.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/Globals/ObjectMgr.cpp')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 9ba54446508..15e6bbeeaf2 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1601,7 +1601,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float if (!goinfo) return 0; - Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(mapId)); + Map* map = sMapMgr->CreateBaseMap(mapId); if (!map) return 0; @@ -1662,7 +1662,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos) AddCreatureToGrid(guid, &data); // Spawn if necessary (loaded grids only) - if (Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(mapId))) + if (Map* map = sMapMgr->CreateBaseMap(mapId)) { // We use spawn coords to spawn if (!map->Instanceable() && map->IsGridLoaded(data.posX, data.posY)) @@ -1715,7 +1715,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float AddCreatureToGrid(guid, &data); // Spawn if necessary (loaded grids only) - if (Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(mapId))) + if (Map* map = sMapMgr->CreateBaseMap(mapId)) { // We use spawn coords to spawn if (!map->Instanceable() && !map->IsRemovalGrid(x, y)) |