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/Instances/InstanceSaveMgr.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/Instances/InstanceSaveMgr.cpp')
| -rwxr-xr-x | src/server/game/Instances/InstanceSaveMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index bc2648ed02b..57e5818a9ff 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -511,7 +511,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr) void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) { sLog->outDebug(LOG_FILTER_MAPS, "InstanceSaveMgr::_ResetInstance %u, %u", mapid, instanceId); - Map* map = (MapInstanced*)sMapMgr->CreateBaseMap(mapid); + Map const* map = sMapMgr->CreateBaseMap(mapid); if (!map->Instanceable()) return; @@ -521,7 +521,7 @@ void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) DeleteInstanceFromDB(instanceId); // even if save not loaded - Map* iMap = ((MapInstanced*)map)->FindMap(instanceId); + Map* iMap = ((MapInstanced*)map)->FindInstanceMap(instanceId); if (iMap && iMap->IsDungeon()) ((InstanceMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY); |