diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-02-01 18:37:34 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-02-01 18:37:34 +0000 |
| commit | 7d55d241bd5828f673a89dd49c5470aabcf52abd (patch) | |
| tree | 7da4446b656cfa1e33d2dc363adcf467b4f09c84 /src/game-server/mapmanager.cpp | |
| parent | 176eb4ed93a5441cb11a5d46927db444894e8327 (diff) | |
| download | manaserv-7d55d241bd5828f673a89dd49c5470aabcf52abd.tar.gz manaserv-7d55d241bd5828f673a89dd49c5470aabcf52abd.tar.xz manaserv-7d55d241bd5828f673a89dd49c5470aabcf52abd.zip | |
Added graceful server shutdown, chose some more sane variables names for SQL
queries and fixed a possible character collision error (patch by Rogier Polak).
Diffstat (limited to 'src/game-server/mapmanager.cpp')
| -rw-r--r-- | src/game-server/mapmanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp index 1bceb8e..dcb9136 100644 --- a/src/game-server/mapmanager.cpp +++ b/src/game-server/mapmanager.cpp @@ -88,7 +88,7 @@ MapManager::~MapManager() } } -Map *MapManager::getMap(int mapId) +Map* MapManager::getMap(int mapId) { Maps::iterator i = maps.find(mapId); assert(i != maps.end() && i->second.isActive); @@ -99,7 +99,8 @@ Map *MapManager::getMap(int mapId) map = MapReader::readMap("maps/" + file); if (!map) { - LOG_ERROR("Unable to load map \"" << file << "\" (id " << mapId << ")"); + LOG_ERROR("Unable to load map \"" << file << "\" (id " + << mapId << ")"); return NULL; } LOG_INFO("Loaded map \"" << file << "\" (id " << mapId << ")"); @@ -119,7 +120,8 @@ void MapManager::raiseActive(int mapId) Maps::iterator i = maps.find(mapId); assert(i != maps.end()); i->second.isActive = true; - LOG_INFO("Activating map \"" << i->second.fileName << "\" (id " << i->first << ")"); + LOG_INFO("Activating map \"" << i->second.fileName << "\" (id " + << i->first << ")"); } bool MapManager::isActive(int mapId) const |