summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-07 12:40:34 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-07 12:40:34 +0000
commit863f3f15f091378c762c0a6f8f30b8f33bb399e4 (patch)
tree482d8aad6fbbf96402f4f42a32cd42fb6507ea33 /src
parent7d2c736d9b1e23e6cf46799199c44ae83778a0c0 (diff)
downloadmana-863f3f15f091378c762c0a6f8f30b8f33bb399e4.tar.gz
mana-863f3f15f091378c762c0a6f8f30b8f33bb399e4.tar.bz2
mana-863f3f15f091378c762c0a6f8f30b8f33bb399e4.tar.xz
mana-863f3f15f091378c762c0a6f8f30b8f33bb399e4.zip
Whoops, stay with our old map for now.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 5bcb821f..4d89bd67 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -125,8 +125,8 @@ void game() {
void do_init()
{
- //tiledMap = Map::load(map_path);
- tiledMap = MapReader::readMap("core/maps/desert.tmx");
+ tiledMap = Map::load(map_path);
+ //tiledMap = MapReader::readMap("core/maps/desert.tmx");
if (!tiledMap) {
error("Could not find map file");
}