diff options
author | Shauren <none@none> | 2010-12-23 23:25:44 +0100 |
---|---|---|
committer | Shauren <none@none> | 2010-12-23 23:25:44 +0100 |
commit | 928443d8993869dfbf3adceabe4ba0b3cfe0edef (patch) | |
tree | b30f1385e6f2dd8d95357590593aa2988b094593 /src/server/game/Grids/ObjectGridLoader.cpp | |
parent | 95daf7998fc3b772fdcd70087c12db80bd5a031a (diff) |
Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Grids/ObjectGridLoader.cpp')
-rwxr-xr-x | src/server/game/Grids/ObjectGridLoader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 4c0d2b0383c..a078c34d26a 100755 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -124,7 +124,7 @@ void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> & { T* obj = new T; uint32 guid = *i_guid; - //sLog.outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading",table,guid); + //sLog->outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading",table,guid); if (!obj->LoadFromDB(guid, map)) { delete obj; @@ -147,7 +147,7 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType uint32 player_guid = itr->first; - Corpse *obj = sObjectAccessor.GetCorpseForPlayerGUID(player_guid); + Corpse *obj = sObjectAccessor->GetCorpseForPlayerGUID(player_guid); if (!obj) continue; @@ -230,7 +230,7 @@ void ObjectGridLoader::LoadN(void) loader.Load(i_grid(x, y), *this); } } - sLog.outDebug("%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses,i_grid.GetGridId(), i_map->GetId()); + sLog->outDebug("%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses,i_grid.GetGridId(), i_map->GetId()); } void ObjectGridUnloader::MoveToRespawnN() @@ -260,7 +260,7 @@ ObjectGridUnloader::Visit(GridRefManager<T> &m) { T *obj = m.getFirst()->getSource(); // if option set then object already saved at this moment - if (!sWorld.getBoolConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) + if (!sWorld->getBoolConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) obj->SaveRespawnTime(); ///- object will get delinked from the manager when deleted delete obj; |