From dcd1a15545c3a8e6ec9bdabd1358f808a1214314 Mon Sep 17 00:00:00 2001 From: Paramat Date: Tue, 28 Aug 2018 23:23:04 +0100 Subject: Play damage sound on player death (#7679) Also run CSM 'on_damage_taken' callback. Improve function logic and remove 'return'. --- src/game.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 005241495..fbfbdd547 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2492,22 +2492,23 @@ void Game::handleClientEvent_None(ClientEvent *event, CameraOrientation *cam) void Game::handleClientEvent_PlayerDamage(ClientEvent *event, CameraOrientation *cam) { - if (client->getHP() == 0) - return; - if (client->moddingEnabled()) { client->getScript()->on_damage_taken(event->player_damage.amount); } - runData.damage_flash += 95.0 + 3.2 * event->player_damage.amount; - runData.damage_flash = MYMIN(runData.damage_flash, 127.0f); + // Damage flash and hurt tilt are not used at death + if (client->getHP() > 0) { + runData.damage_flash += 95.0f + 3.2f * event->player_damage.amount; + runData.damage_flash = MYMIN(runData.damage_flash, 127.0f); - LocalPlayer *player = client->getEnv().getLocalPlayer(); + LocalPlayer *player = client->getEnv().getLocalPlayer(); - player->hurt_tilt_timer = 1.5; - player->hurt_tilt_strength = - rangelim(event->player_damage.amount / 4, 1.0f, 4.0f); + player->hurt_tilt_timer = 1.5f; + player->hurt_tilt_strength = + rangelim(event->player_damage.amount / 4.0f, 1.0f, 4.0f); + } + // Play damage sound client->getEventManager()->put(new SimpleTriggerEvent(MtEvent::PLAYER_DAMAGE)); } -- cgit v1.2.3