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/InstanceSaveMgr.cpp | |
parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/InstanceSaveMgr.cpp')
-rw-r--r-- | src/game/InstanceSaveMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index 2c304191136..d45e3fac451 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -580,7 +580,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr) void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) { sLog.outDebug("InstanceSaveMgr::_ResetInstance %u, %u", mapid, instanceId); - Map *map = (MapInstanced*)MapManager::Instance().GetBaseMap(mapid); + Map *map = (MapInstanced*)MapManager::Instance().CreateBaseMap(mapid); if(!map->Instanceable()) return; @@ -597,7 +597,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe { // global reset for all instances of the given map // note: this isn't fast but it's meant to be executed very rarely - Map const *map = MapManager::Instance().GetBaseMap(mapid); + Map const *map = MapManager::Instance().CreateBaseMap(mapid); if(!map->Instanceable()) return; uint64 now = (uint64)time(NULL); |