last fire animation fixed

This commit is contained in:
Bryce Hutchings 2002-05-11 18:47:09 +00:00
parent 66e8d26242
commit d3572b7d57

View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.72 2002/05/11 18:47:09 niceass
// last fire animation fixed
//
// Revision 1.71 2002/05/08 07:24:33 niceass // Revision 1.71 2002/05/08 07:24:33 niceass
// Double jumping added. Everything feels very good. // Double jumping added. Everything feels very good.
// //
@ -2496,6 +2499,7 @@ static void PM_Weapon( void ) {
// This should change pm->ps->generic1 so we can animate // This should change pm->ps->generic1 so we can animate
// Elder: don't repeat if on semi-auto // Elder: don't repeat if on semi-auto
// temp hack // temp hack
if (pm->ps->weapon == WP_AKIMBO) if (pm->ps->weapon == WP_AKIMBO)
{ {
// don't repeat animation if on second akimbo shot // don't repeat animation if on second akimbo shot
@ -2507,9 +2511,9 @@ static void PM_Weapon( void ) {
} }
} }
else { else {
if ( pm->ps->ammo[pm->ps->weapon] > 1 ) if ( pm->ps->ammo[pm->ps->weapon] > 1 || pm->ps->weapon != WP_PISTOL )
PM_StartWeaponAnim( WP_ANIM_FIRE ); PM_StartWeaponAnim( WP_ANIM_FIRE );
else if ( pm->ps->weapon == WP_PISTOL ) else
PM_StartWeaponAnim( WP_ANIM_EXTRA1 ); // Fix for last round fired PM_StartWeaponAnim( WP_ANIM_EXTRA1 ); // Fix for last round fired
} }
} }