summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-02-20 17:16:37 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-02-20 17:16:37 +0000
commit38a97bac830d6afe82fe3f68f3d8a0831bb5b643 (patch)
treeae8f26697caeee74da81c7b87cda0ac90faf5fb7 /src/map.h
parentd332272741e8382409453b975c66235d45e66cc7 (diff)
downloadmana-38a97bac830d6afe82fe3f68f3d8a0831bb5b643.tar.gz
mana-38a97bac830d6afe82fe3f68f3d8a0831bb5b643.tar.bz2
mana-38a97bac830d6afe82fe3f68f3d8a0831bb5b643.tar.xz
mana-38a97bac830d6afe82fe3f68f3d8a0831bb5b643.zip
More progress towards loading XML maps.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/map.h b/src/map.h
index ce5725da..2f03dcbe 100644
--- a/src/map.h
+++ b/src/map.h
@@ -94,12 +94,7 @@ class Map
/**
* Loads a map file (gat).
*/
- bool load(const std::string &mapFile);
-
- /**
- * Loads an XML map file (tmx).
- */
- bool loadXmlMap(const std::string &mapFile);
+ static Map *load(const std::string &mapFile);
/**
* Sets the size of the map. This will destroy any existing map data.
@@ -166,6 +161,4 @@ class Map
int onClosedList, onOpenList;
};
-extern Map tiledMap;
-
#endif