diff options
| author | XTZGZoReX <none@none> | 2010-08-08 05:25:45 +0200 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2010-08-08 05:25:45 +0200 |
| commit | 9083271a2f29326ae91a3239b972ca63513169f6 (patch) | |
| tree | 4b28f5c0c3cb4d447140743bd413402a7c685f8d /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | 93fc24ece91443225bbecf9f3cb59658194dcbf3 (diff) | |
* Some singleton renames for consistency:
accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index dcc3271e19e..86b148edfa1 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -193,7 +193,7 @@ time_t InstanceSave::GetResetTimeForDB() // to cache or not to cache, that is the question InstanceTemplate const* InstanceSave::GetTemplate() { - return objmgr.GetInstanceTemplate(m_mapid); + return sObjectMgr.GetInstanceTemplate(m_mapid); } MapEntry const* InstanceSave::GetMapEntry() @@ -211,8 +211,8 @@ bool InstanceSave::UnloadIfEmpty() { if (m_playerList.empty() && m_groupList.empty()) { - if (!sInstanceSaveManager.lock_instLists) - sInstanceSaveManager.RemoveInstanceSave(GetInstanceId()); + if (!sInstanceSaveMgr.lock_instLists) + sInstanceSaveMgr.RemoveInstanceSave(GetInstanceId()); return false; } else @@ -254,7 +254,7 @@ void InstanceSaveManager::CleanupInstances() bar.step(); // load reset times and clean expired instances - sInstanceSaveManager.LoadResetTimes(); + sInstanceSaveMgr.LoadResetTimes(); // clean character/group - instance binds with invalid group/characters _DelHelper(CharacterDatabase, "character_instance.guid, instance", "character_instance", "LEFT JOIN characters ON character_instance.guid = characters.guid WHERE characters.guid IS NULL"); @@ -617,7 +617,7 @@ void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) Map* iMap = ((MapInstanced*)map)->FindMap(instanceId); if (iMap && iMap->IsDungeon()) ((InstanceMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY); - else objmgr.DeleteRespawnTimeForInstance(instanceId); // even if map is not loaded + else sObjectMgr.DeleteRespawnTimeForInstance(instanceId); // even if map is not loaded } void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, uint32 timeLeft) |