Merge branch 'master' into Respawning

# Conflicts: # resources/DefaultConfig.ini # resources/Schema/Entities/MovementTest.xml # src/Game/Systems/SoundSystem.cpp
2016-02-12 00:29:51 +01:00
parent dd131e7652 04f77da6f1
commit 11af6a3078
62 changed files with 7752 additions and 858 deletions
@@ -54,7 +54,7 @@ bool SoundSystem::OnInputCommand(const Events::InputCommand & e)
    }
    if (e.Command == "TakeDamage" && e.Value > 0 && LocalPlayer.Valid()) {
        Events::PlayerDamage ev;
-        ev.Player = LocalPlayer;
+        ev.Victim = LocalPlayer;
        ev.Damage = e.Value;
        m_EventBroker->Publish(ev);
    }