From 4770b9b27b0aebf29117ca1345db0cf0d0ea04fc Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Fri, 3 Jan 2014 01:21:21 -0500 Subject: [PATCH] - Fixed: Rampage timer should only reset when the weapon is ready to be fired. --- src/g_shared/sbar_mugshot.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp index 0849fd3544..aa0f9302a7 100644 --- a/src/g_shared/sbar_mugshot.cpp +++ b/src/g_shared/sbar_mugshot.cpp @@ -270,7 +270,8 @@ void FMugShot::Tick(player_t *player) RampageTimer++; } } - else + // Only reset the rampage timer if the weapon becomes ready to fire. + else if((player->WeaponState & (WF_WEAPONREADY|WF_WEAPONREADYALT))) { RampageTimer = 0; }