Refactor johan branch for compiling with g++

2016-05-22 23:19:05 +02:00
parent a8415db4ac
commit 7d13269480
13 changed files with 773 additions and 792 deletions
@@ -4,11 +4,16 @@
 #include "LevelObject.h"
 #include "json.h"
 #include <fstream>
+#include <iostream>

 World::World() : player(Player::getInstance())
 {
-	json::Value v = json::readJson(std::ifstream("worlds/world1.json"));
-
+	std::ifstream file("worlds/world1.json");
+	if(!file.is_open())
+		std::cout<<"Uhoh, can't open file\n";
+	json::Value v = json::readJson(file);
+	std::cout<<v;
+	file.close();
 	player.position.x = v["player"]["startposition"][0];
 	player.position.y = v["player"]["startposition"][1];
 	player.position.z = v["player"]["startposition"][2];