diff --git a/World.cpp b/World.cpp index be280ca..74306d5 100644 --- a/World.cpp +++ b/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(id,fileName)); } diff --git a/worlds/world1.json b/worlds/world1.json index 4a78934..5ec3629 100644 --- a/worlds/world1.json +++ b/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": [