Merge branch 'developer' into feature/refactor_crystals

2016-06-09 12:41:53 +02:00
parent 9cfaf07eba 0aad7262d6
commit 3ed5331437
29 changed files with 2761 additions and 12 deletions
@@ -18,6 +18,7 @@ private:
 	Player* player;
 	HeightMap* heightmap;
 	Interface* interface;
+	int music_id;

 	std::vector<Entity*> entities;
 	std::vector<Enemy*> enemies;