zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-07 07:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- So we did end up restoring the variable that the last commit was compensating for.

Browse source
This commit is contained in:
Braden Obrzut 2014-01-04 00:37:15 -05:00
parent 4770b9b27b
commit b0f40c0733
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_shared/sbar_mugshot.cpp
View file

@ -263,15 +263,14 @@ void FMugShot::Tick(player_t *player)
CurrentState = NULL; 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) if (RampageTimer != ST_RAMPAGEDELAY)
{ {
RampageTimer++; RampageTimer++;
} }
} }
// Only reset the rampage timer if the weapon becomes ready to fire. else
else if((player->WeaponState & (WF_WEAPONREADY|WF_WEAPONREADYALT)))
{ {
RampageTimer = 0; RampageTimer = 0;
} }