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
@@ -8,7 +8,8 @@
 #include <iostream>
 #include "WorldHandler.h"

-World::World(const std::string &fileName)
+World::World(const std::string &fileName):
+	music_id(-1)
 {
 	//Store player instance
 	player = Player::getInstance();
@@ -162,6 +163,15 @@ World::World(const std::string &fileName)
 			}
 		}
 	}
+
+	if (!v["world"]["music"].isNull())
+	{
+		music_id = CrystalPoint::GetSoundSystem().LoadSound(v["world"]["music"].asString().c_str(), true);
+		Sound* music = CrystalPoint::GetSoundSystem().GetSound(music_id);
+		music->SetPos(Vec3f(), Vec3f());
+		music->Play();
+	}
+
 }