1 files changed, 14 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp
index b7fd9f86..19a4c88f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -125,19 +125,23 @@ void game() {
 
 void do_init()
 {
-    /*tiledMap = Map::load(map_path);
-    std::cout << map_path << std::endl;*/
     std::string path(map_path);
+    std::string pathDir = path.substr(0, path.rfind("."));
 
-    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);
+    // Try .tmx map file
+    pathDir.insert(pathDir.size(), ".tmx");
+    tiledMap = Map::load(pathDir);
 
-    if (!tiledMap) {
-        logger.error("Could not find map file");
+    if (!tiledMap)
+    {
+        // Try .tmx.gz map file
+        pathDir.insert(pathDir.size(), ".gz");
+        tiledMap = Map::load(pathDir);
+
+        if (!tiledMap)
+        {
+            logger.error("Could not find map file!");
+        }
     }
 
     // Start playing background music