Fixed capital letters and string return error..

This commit is contained in:
jancoow
2016-05-23 12:34:55 +02:00
parent 9d3cfa7e2a
commit e7a7cc5588
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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
View File
@@ -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": [