From b0f40c07338cea851f03720e7355b4ed71d55705 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Sat, 4 Jan 2014 00:37:15 -0500 Subject: [PATCH] - So we did end up restoring the variable that the last commit was compensating for. --- src/g_shared/sbar_mugshot.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp index aa0f9302a7..96dd072656 100644 --- a/src/g_shared/sbar_mugshot.cpp +++ b/src/g_shared/sbar_mugshot.cpp @@ -263,15 +263,14 @@ void FMugShot::Tick(player_t *player) CurrentState = NULL; } } - if ((player->cmd.ucmd.buttons & (BT_ATTACK|BT_ALTATTACK)) && !(player->cheats & (CF_FROZEN | CF_TOTALLYFROZEN)) && player->ReadyWeapon) + if (player->attackdown && !(player->cheats & (CF_FROZEN | CF_TOTALLYFROZEN)) && player->ReadyWeapon) { if (RampageTimer != ST_RAMPAGEDELAY) { RampageTimer++; } } - // Only reset the rampage timer if the weapon becomes ready to fire. - else if((player->WeaponState & (WF_WEAPONREADY|WF_WEAPONREADYALT))) + else { RampageTimer = 0; }