diff options
| author | Tim Angus <tim@ngus.net> | 2002-08-28 04:05:50 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2002-08-28 04:05:50 +0000 |
| commit | 924e657d2269d345268d0aca4a27c76e61a04617 (patch) | |
| tree | 44dd3a31a26d217433fef6a5f6c22ca8528e6100 /src/game/bg_pmove.c | |
| parent | 6e80011a5dc04f9d9113265c733dfc6075f5326b (diff) | |
* 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
Diffstat (limited to 'src/game/bg_pmove.c')
| -rw-r--r-- | src/game/bg_pmove.c | 8 |
1 files changed, 3 insertions, 5 deletions
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 ); |