Merge remote-tracking branch 'origin/master' into Sound

2015-10-21 13:18:42 +02:00
parent c23c7e4d8e 2954e2cbb3
commit d0668effea
121 changed files with 11835 additions and 4246 deletions
@@ -66,6 +66,8 @@ void dd::Systems::BallSystem::Initialize()
    for (int i = 0; i < Lives(); i++) {
        CreateLife(i);
    }
+
+	m_GodMode = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<bool>("Cheat.GodMode", false);
 }

 void dd::Systems::BallSystem::Update(double dt)
@@ -447,8 +449,9 @@ void dd::Systems::BallSystem::CreateLife(int number)

 bool dd::Systems::BallSystem::OnLifeLost(const dd::Events::LifeLost &event)
 {
-    SetLives(Lives() - 1);
-
+	if (!m_GodMode){
+		SetLives(Lives() - 1);
+	}
    return true;
 }