Przeglądaj źródła

Fixed capital letters and string return error..

jancoow 9 lat temu
rodzic
commit
e7a7cc5588
2 zmienionych plików z 4 dodań i 4 usunięć
  1. 1 1
      World.cpp
  2. 3 3
      worlds/world1.json

+ 1 - 1
World.cpp

@@ -48,7 +48,7 @@ World::World() : player(Player::getInstance())
 
 		std::string fileName = "";
 		if (!enemy_model["file"].isNull())
-			fileName = enemy_model["file"];
+			fileName = enemy_model["file"].asString();
 
 		enemy_models.push_back(std::pair<int, std::string>(id,fileName));
 	}

+ 3 - 3
worlds/world1.json

@@ -4,11 +4,11 @@
   },
   "objects": [
     {
-      "file": "models/boom/boom.obj",
+      "file": "models/boom/Boom.obj",
       "pos": [ 4, 0, -4 ]
     },
     {
-      "file": "models/teleporter/teleporter.obj",
+      "file": "models/Teleporter/Teleporter.obj",
       "pos": [ 0, 0, -4 ],
       "rot": [ 0, 0, 0 ]
     }
@@ -16,7 +16,7 @@
   "enemy_models": [
     {
       "id": 0,
-      "file": "models/squid/blooper.obj"
+      "file": "models/squid/Blooper.obj"
     }
   ],
   "enemy_data": [