Load weapons from JSON

2016-06-21 18:25:16 +02:00
parent 4437acb9f2
commit 3025fecf94
7 changed files with 99 additions and 11 deletions
@@ -64,8 +64,8 @@ World::World(const std::string &fileName)

 	//Set player starting position
 	player->position.x = v["player"]["startposition"][0].asFloat();
-	player->position.y = v["player"]["startposition"][1].asFloat();
 	player->position.z = v["player"]["startposition"][2].asFloat();
+	player->position.y = heightmap->GetHeight(player->position.x, player->position.z);

 	//Load and place objects into world
 	for (auto object : v["objects"])