diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-19 11:43:41 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-19 11:43:41 +0000 |
| commit | d42e9ea834a07c6f60dd5248db6520d1ff423ac4 (patch) | |
| tree | 7de19d851aecae83bc8467d70c9a718ebff98205 /src/game.cpp | |
| parent | 32ca8ca9551070ba1086cd5b6c973620052061ed (diff) | |
| download | mana-d42e9ea834a07c6f60dd5248db6520d1ff423ac4.tar.gz mana-d42e9ea834a07c6f60dd5248db6520d1ff423ac4.tar.bz2 mana-d42e9ea834a07c6f60dd5248db6520d1ff423ac4.tar.xz mana-d42e9ea834a07c6f60dd5248db6520d1ff423ac4.zip | |
Made item amount window a modal dialog and removed support for old map format.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp index b849fcdd..7b7bbd98 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -36,6 +36,7 @@ #include "gui/npc.h" #include "gui/stats.h" #include "gui/ok_dialog.h" +#include "gui/confirm_dialog.h" #include "net/protocol.h" #include "resources/mapreader.h" #include <SDL.h> @@ -155,14 +156,13 @@ void do_init() // Try .tmx map file pathDir.insert(pathDir.size(), ".tmx"); - tiledMap = Map::load(pathDir); - + tiledMap = MapReader::readMap(pathDir); if (!tiledMap) { // Try .tmx.gz map file pathDir.insert(pathDir.size(), ".gz"); - tiledMap = Map::load(pathDir); + tiledMap = MapReader::readMap(pathDir); if (!tiledMap) { @@ -976,7 +976,7 @@ void do_parse() strcpy(strrchr(map_path, '.') + 1, "tmx.gz"); if (tiledMap) delete tiledMap; - tiledMap = Map::load(map_path); + tiledMap = MapReader::readMap(map_path); if (tiledMap) { // Delete all beings except the local player |