Merge branch 'developer' into feature/OpenAL

# Conflicts: # CrystalPoint.vcxproj.filters # Enemy.cpp # Enemy.h # worlds/small.json
2016-06-09 11:44:45 +02:00
parent 117010b9fe 593b9547cf
commit 5c24a34202
17 changed files with 2003 additions and 30 deletions
@@ -24,7 +24,7 @@ void WorldHandler::ChangeWorld(int i)
 			delete world;

 		world = new World(worldfiles[i]);
-		worldIndex = i;
+		worldIndex = i;		
 		loadingWorld = false;
 	}
 }