+attack cancels reloads

This commit is contained in:
Bryce Hutchings 2002-06-11 03:09:28 +00:00
parent 0c3a3fdb76
commit 58a41b0d1a

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.77 2002/06/11 03:09:28 niceass
// +attack cancels reloads
//
// Revision 1.76 2002/06/07 19:42:44 niceass
// leg damage much closer to AQ2
//
@ -1863,6 +1866,11 @@ static void PM_Reload( void )
pm->cmd.buttons |= BUTTON_AFFIRMATIVE;
}
// NiceAss: +Attack cancels fast reloads
if ( pm->cmd.buttons & BUTTON_ATTACK && pm->ps->stats[STAT_RELOADATTEMPTS] > 1 ) {
pm->ps->stats[STAT_RELOADATTEMPTS] = 1;
}
if ( pm->cmd.buttons & BUTTON_AFFIRMATIVE ) {
if ( !(pm->ps->pm_flags & PMF_RELOAD_HELD) )
{