diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-23 17:24:49 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-23 17:24:49 +0000 |
| commit | eca52c90e80f76c1fdffb5b1420a9cc4641de2fb (patch) | |
| tree | 3e753b6506977b75a15eec35774452ff067af116 /src/game-server/mapmanager.cpp | |
| parent | cac2b7d1bd79e312e2009eca216ace2a29e60621 (diff) | |
| download | manaserv-eca52c90e80f76c1fdffb5b1420a9cc4641de2fb.tar.gz manaserv-eca52c90e80f76c1fdffb5b1420a9cc4641de2fb.tar.xz manaserv-eca52c90e80f76c1fdffb5b1420a9cc4641de2fb.zip | |
Accepted fix by rodge, getting rid of assertion failure when an admin tries to
warp to a non-existing map.
Diffstat (limited to 'src/game-server/mapmanager.cpp')
| -rw-r--r-- | src/game-server/mapmanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp index de752c0..3044d35 100644 --- a/src/game-server/mapmanager.cpp +++ b/src/game-server/mapmanager.cpp @@ -102,8 +102,7 @@ void MapManager::deinitialize() MapComposite *MapManager::getMap(int mapId) { Maps::iterator i = maps.find(mapId); - assert(i != maps.end()); - return i->second; + return (i != maps.end()) ? i->second : NULL; } void MapManager::raiseActive(int mapId) |