From 56c77400a6822e5a84aa4bb1c3842b35ef14e9ea Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 25 Mar 2005 19:53:42 +0000
Subject: Put map in new place and unified loading location.

---
 src/game.cpp                | 2 +-
 src/gui/char_select.cpp     | 2 +-
 src/resources/mapreader.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 3842ec45..041274d2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -810,7 +810,7 @@ void do_parse() {
                     // Warp
                 case 0x0091:
                     memset(map_path, '\0', 480);
-                    strcat(map_path, "./core/maps/");
+                    strcat(map_path, "data/maps/");
                     strncat(map_path, RFIFOP(2), 497 - strlen(map_path));
                     logger.log("Warping to %s (%d, %d)\n",
                             map_path, RFIFOW(18), RFIFOW(20));
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 97c35a57..4b8a9099 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -223,7 +223,7 @@ void CharSelectDialog::serverCharSelect()
         }
         char_ID = RFIFOL(2);
         memset(map_path, '\0', 480);
-        strcat(map_path, "./data/map/");
+        strcat(map_path, "data/maps/");
         strncat(map_path, RFIFOP(6), 479 - strlen(map_path));
         map_address = RFIFOL(22);
         map_port = RFIFOW(26);
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 38e15945..31048207 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -58,7 +58,7 @@ Map *MapReader::readMap(const std::string &filename)
 {
     logger.log("Attempting to parse XML map data");
 
-    std::string name = std::string("data/") + filename;
+    std::string name = /*std::string("data/") +*/ filename;
     xmlDocPtr doc = xmlParseFile(name.c_str());
 
     if (doc) {
-- 
cgit v1.2.3-70-g09d2