summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 041274d2..b7fd9f86 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -125,14 +125,16 @@ 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;*/
+ std::string path(map_path);
+
+ std::string pathDir = path.substr(0, path.rfind(".") + 1);
+ pathDir.insert(pathDir.size(), "tmx");
+
+ //tiledMap = Map::load("data/maps/new_3-1.tmx.gz");
+ //std::cout << pathDir << std::endl;
tiledMap = Map::load(map_path);
- std::cout << map_path << std::endl;
if (!tiledMap) {
logger.error("Could not find map file");