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/collision/Management/VMapManager2.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/collision/Management/VMapManager2.cpp')
-rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index c2cebaa1292..34d87b7816d 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -270,11 +270,11 @@ namespace VMAP WorldModel *worldmodel = new WorldModel(); if (!worldmodel->readFile(basepath + filename + ".vmo")) { - sLog.outError("VMapManager2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str()); + sLog->outError("VMapManager2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str()); delete worldmodel; return NULL; } - sLog.outDebug("VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); + sLog->outDebug("VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); model = iLoadedModelFiles.insert(std::pair<std::string, ManagedModel>(filename, ManagedModel())).first; model->second.setModel(worldmodel); } @@ -287,12 +287,12 @@ namespace VMAP ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) { - sLog.outError("VMapManager2: trying to unload non-loaded file '%s'", filename.c_str()); + sLog->outError("VMapManager2: trying to unload non-loaded file '%s'", filename.c_str()); return; } if( model->second.decRefCount() == 0) { - sLog.outDebug("VMapManager2: unloading file '%s'", filename.c_str()); + sLog->outDebug("VMapManager2: unloading file '%s'", filename.c_str()); delete model->second.getModel(); iLoadedModelFiles.erase(model); } |