diff options
author | Machiavelli <none@none> | 2010-06-19 20:51:56 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2010-06-19 20:51:56 +0200 |
commit | d183d94be81dd64501fe72d674b40dd2f0a94fed (patch) | |
tree | 0b1bb3b19b94fa734564fea8147523de102d2607 | |
parent | 108970ddbaad021460b7313998f39b1f544c5464 (diff) |
Fix possible crash in VMapManager sLog.OutXX functions.
--HG--
branch : trunk
-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 032793b1c09..8e3681864d0 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -299,11 +299,11 @@ namespace VMAP WorldModel *worldmodel = new WorldModel(); if (!worldmodel->readFile(basepath + filename + ".vmo")) { - sLog.outError("VMapManager2: could not load '%s%s.vmo'!", basepath, filename); + 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, filename); + 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); } @@ -316,12 +316,12 @@ namespace VMAP ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) { - sLog.outError("VMapManager2: trying to unload non-loaded file '%s'!", filename); + 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); + sLog.outDebug("VMapManager2: unloading file '%s'", filename.c_str()); delete model->second.getModel(); iLoadedModelFiles.erase(model); } |