Fixed Sniper zooming during LCA

This commit is contained in:
Daniel Simoes 2002-03-11 01:29:54 +00:00
parent bc8842788b
commit 576d25c92f

View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.60 2002/03/11 01:29:54 slicer
// Fixed Sniper zooming during LCA
//
// Revision 1.59 2002/03/02 22:02:09 niceass // Revision 1.59 2002/03/02 22:02:09 niceass
// mk23 and akimbo last fire animation fixed // mk23 and akimbo last fire animation fixed
// //
@ -2678,11 +2681,6 @@ static void PM_Weapon( void ) {
} }
} }
// JBravo: no shooting during LCA
if ( RQ3_lca.integer) {
return;
}
if ( pm->ps->weaponstate == WEAPON_RAISING && if ( pm->ps->weaponstate == WEAPON_RAISING &&
!( ( pm->ps->persistant[PERS_WEAPONMODES] & RQ3_KNIFEMODE) && pm->ps->stats[STAT_BURST]) ) { !( ( pm->ps->persistant[PERS_WEAPONMODES] & RQ3_KNIFEMODE) && pm->ps->stats[STAT_BURST]) ) {
pm->ps->weaponstate = WEAPON_READY; pm->ps->weaponstate = WEAPON_READY;
@ -2724,6 +2722,12 @@ static void PM_Weapon( void ) {
if ( pm->ps->weapon == WP_KNIFE) pm->ps->weaponstate = WEAPON_READY; if ( pm->ps->weapon == WP_KNIFE) pm->ps->weaponstate = WEAPON_READY;
} }
// JBravo: no shooting during LCA
if ( RQ3_lca.integer) {
return;
}
// Elder: fire on release - based on code from inolen // Elder: fire on release - based on code from inolen
// check for fire // check for fire
// if they are pressing attack and their current weapon is the grenade // if they are pressing attack and their current weapon is the grenade