summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2004-11-30 23:37:24 +0000
committerTim Angus <tim@ngus.net>2004-11-30 23:37:24 +0000
commit47ed06f6013992971220db21196f5d3df8678ce7 (patch)
tree201bc5a316e7638a60cc9e28dfbd85412d7e700d /src/game
parent71ce8384da523c870c2c57e539a3770844997541 (diff)
* WP_BLASTER animations
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 9c29b96b..7e7f7456 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2627,7 +2627,12 @@ static void PM_TorsoAnimation( void )
return;
if( pm->ps->weaponstate == WEAPON_READY )
- PM_ContinueTorsoAnim( TORSO_STAND );
+ {
+ if( pm->ps->weapon == WP_BLASTER )
+ PM_ContinueTorsoAnim( TORSO_STAND2 );
+ else
+ PM_ContinueTorsoAnim( TORSO_STAND );
+ }
}
@@ -2727,7 +2732,12 @@ static void PM_Weapon( void )
pm->ps->weaponstate = WEAPON_READY;
if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
- PM_StartTorsoAnim( TORSO_STAND );
+ {
+ if( pm->ps->weapon == WP_BLASTER )
+ PM_ContinueTorsoAnim( TORSO_STAND2 );
+ else
+ PM_ContinueTorsoAnim( TORSO_STAND );
+ }
return;
}
@@ -2930,6 +2940,10 @@ static void PM_Weapon( void )
}
break;
+ case WP_BLASTER:
+ PM_StartTorsoAnim( TORSO_ATTACK2 );
+ break;
+
default:
PM_StartTorsoAnim( TORSO_ATTACK );
break;