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

# Conflicts: # resources/Schema/Entities/Player.xml
2016-02-03 16:10:11 +01:00
parent c2833b10c4 2cbeef4c69
commit 2e3e59a1e2
42 changed files with 2093 additions and 209 deletions
@@ -405,7 +405,7 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
    // breathe
    std::vector<ALuint> buffers;
    buffers.push_back(source->SoundResource->Buffer());
-    int ammountOfbreaths = (e.Damage / 10) + 2; // TEMP: Idk something stupid like this shit
+    int ammountOfbreaths = (static_cast<int>(e.Damage) / 10) + 2; // TEMP: Idk something stupid like this shit
    for (int i = 0; i < ammountOfbreaths; i++) {
        buffers.push_back(ResourceManager::Load<Sound>("Audio/exhausted/breath.wav")->Buffer());
    }