diff options
| author | Chuck Miller <chuck@miller-server.(none)> | 2008-12-06 01:09:44 -0500 |
|---|---|---|
| committer | Chuck Miller <chuck@miller-server.(none)> | 2008-12-06 01:09:44 -0500 |
| commit | a841518cd56f96171cbe7d0c80fd31470d84ab11 (patch) | |
| tree | 4f5dd5f33a7157d2d43edbdeda2be68eeb411a22 /src/game-server/mapreader.cpp | |
| parent | 9bdfd39c3b7101f8175049336bff412c38adb2ba (diff) | |
| download | manaserv-a841518cd56f96171cbe7d0c80fd31470d84ab11.tar.gz manaserv-a841518cd56f96171cbe7d0c80fd31470d84ab11.tar.bz2 manaserv-a841518cd56f96171cbe7d0c80fd31470d84ab11.tar.xz manaserv-a841518cd56f96171cbe7d0c80fd31470d84ab11.zip | |
Fixes map warp issues, and has a better starting location
Diffstat (limited to 'src/game-server/mapreader.cpp')
| -rw-r--r-- | src/game-server/mapreader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index 5d5979d6..9caddc24 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -170,7 +170,7 @@ Map* MapReader::readMap(xmlNodePtr node, std::string const &path, if (objType == "WARP") { - int destMapId = -1; + std::string destMapName = std::string(); int destX = -1; int destY = -1; @@ -189,7 +189,7 @@ Map* MapReader::readMap(xmlNodePtr node, std::string const &path, value = utils::toupper(value); if (value == "DEST_MAP") { - destMapId = getObjectProperty(propertyNode, -1); + destMapName = getObjectProperty(propertyNode, std::string()); } else if (value == "DEST_X") { @@ -203,9 +203,9 @@ Map* MapReader::readMap(xmlNodePtr node, std::string const &path, } } - if (destMapId != -1 && destX != -1 && destY != -1) + if (destMapName != "" && destX != -1 && destY != -1) { - MapComposite *destMap = MapManager::getMap(destMapId); + MapComposite *destMap = MapManager::getMap(destMapName); if (destMap) { things.push_back(new TriggerArea( |