diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-03-24 19:56:46 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-03-24 19:56:46 +0000 |
| commit | 0259c8d56cb54d7b058cdeff4d27d7fd371c07f1 (patch) | |
| tree | 50104744515060ec31945c43b730e7c343edff86 /src/game.cpp | |
| parent | 439b263b9d23ee2065d2ba9d86ebfd6d2b75b976 (diff) | |
| download | mana-0259c8d56cb54d7b058cdeff4d27d7fd371c07f1.tar.gz mana-0259c8d56cb54d7b058cdeff4d27d7fd371c07f1.tar.bz2 mana-0259c8d56cb54d7b058cdeff4d27d7fd371c07f1.tar.xz mana-0259c8d56cb54d7b058cdeff4d27d7fd371c07f1.zip | |
Should fix the last commit
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 15c730f1..2506406e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -37,6 +37,7 @@ #include "gui/stats.h" #include "gui/ok_dialog.h" #include "net/protocol.h" +#include "resources/mapreader.h" #include <SDL.h> #include <sstream> @@ -124,7 +125,15 @@ void game() { void do_init() { + //tiledMap = Map::load(map_path); + //std::string path(map_path); + + /*std::string pathDir = path.substr(0, path.rfind(".") + 1); + pathDir.insert(pathDir.size(), "tmx.gz");*/ + tiledMap = Map::load(map_path); + std::cout << map_path << std::endl; + if (!tiledMap) { error("Could not find map file"); } @@ -796,7 +805,7 @@ void do_parse() { // Warp case 0x0091: memset(map_path, '\0', 480); - strcat(map_path, "./data/map/"); + strcat(map_path, "./core/maps/"); strncat(map_path, RFIFOP(2), 497 - strlen(map_path)); log("Warping to %s (%d, %d)\n", map_path, RFIFOW(18), RFIFOW(20)); |