diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-07-17 18:05:07 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-07-17 18:05:07 +0000 |
| commit | 28010750064bdf3bc8aea36565d788d8a068ef2a (patch) | |
| tree | 3b4cbe4889a041a634180af8f6474d3b6d3fb08f /src/game-server/mapmanager.cpp | |
| parent | 2359f42b667f9f0ac182bb1dccd26bd5c034717a (diff) | |
| download | manaserv-28010750064bdf3bc8aea36565d788d8a068ef2a.tar.gz manaserv-28010750064bdf3bc8aea36565d788d8a068ef2a.tar.xz manaserv-28010750064bdf3bc8aea36565d788d8a068ef2a.zip | |
Implemented loading of warp and spawn areas from map files.
Diffstat (limited to 'src/game-server/mapmanager.cpp')
| -rw-r--r-- | src/game-server/mapmanager.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp index 58aace1..ab0d0fe 100644 --- a/src/game-server/mapmanager.cpp +++ b/src/game-server/mapmanager.cpp @@ -117,18 +117,13 @@ void MapManager::raiseActive(int mapId) } std::string const &file = composite->getName(); - Map *map = MapReader::readMap("maps/" + file); - if (!map) - { - LOG_ERROR("Unable to load map \"" << file << "\" (id " - << mapId << ")"); - return; - } + MapReader::readMap("maps/" + file, composite); - composite->setMap(map); LOG_INFO("Activated map \"" << file << "\" (id " << mapId << ")"); - // will need to load extra map related resources here also + // Add some testing stuff extern void testingMap(MapComposite *); testingMap(composite); } + + |