From 924e657d2269d345268d0aca4a27c76e61a04617 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Wed, 28 Aug 2002 04:05:50 +0000 Subject: * Poison cloud WP_GRAB_CLAW_UPG server and client side * Bug fixes to new wall walking code * Removed synced weapons * A few random bug fixes * Refactored and improved CG_LaunchSprite a little --- src/game/bg_pmove.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/game/bg_pmove.c') diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 9b274e2f..0539294e 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2346,10 +2346,7 @@ static void PM_Weapon( void ) { if( BG_WeaponHasAltMode( pm->ps->weapon ) ) { - if( BG_WeaponModesAreSynced( pm->ps->weapon ) && attack1 ) - PM_AddEvent( EV_FIRE_WEAPONBOTH ); - else - PM_AddEvent( EV_FIRE_WEAPON2 ); + PM_AddEvent( EV_FIRE_WEAPON2 ); } else { @@ -2523,7 +2520,8 @@ void PM_UpdateViewAngles( playerState_t *ps, const usercmd_t *cmd ) //convert viewangles -> axis AnglesToAxis( tempang, axis ); - if( !BG_rotateAxis( ps->grapplePoint, axis, rotaxis, qfalse, + if( !( ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) || + !BG_rotateAxis( ps->grapplePoint, axis, rotaxis, qfalse, ps->stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING ) ) AxisCopy( axis, rotaxis ); -- cgit