Jetpack sounds and graphics

2 files changed, 27 insertions, 11 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index c6241fbd..e6243391 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -3436,12 +3436,19 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
   s->weapon = ps->weapon;
   s->groundEntityNum = ps->groundEntityNum;
 
-  /*s->powerups = 0;
-  for ( i = 0 ; i < MAX_POWERUPS ; i++ ) {
-    if ( ps->powerups[ i ] ) {
-      s->powerups |= 1 << i;
+  //store items held and active items in otherEntityNum
+  s->modelindex = 0;
+  s->modelindex2 = 0;
+  for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ )
+  {
+    if( BG_gotItem( i, ps->stats ) )
+    {
+      s->modelindex |= 1 << i;
+
+      if( BG_activated( i, ps->stats ) )
+        s->modelindex2 |= 1 << i;
     }
-  }*/
+  }
 
   //TA: use powerups field to store team/class info:
   s->powerups = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
@@ -3529,12 +3536,19 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
   s->weapon = ps->weapon;
   s->groundEntityNum = ps->groundEntityNum;
 
-  /*s->powerups = 0;
-  for ( i = 0 ; i < MAX_POWERUPS ; i++ ) {
-    if ( ps->powerups[ i ] ) {
-      s->powerups |= 1 << i;
+  //store items held and active items in otherEntityNum
+  s->modelindex = 0;
+  s->modelindex2 = 0;
+  for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ )
+  {
+    if( BG_gotItem( i, ps->stats ) )
+    {
+      s->modelindex |= 1 << i;
+
+      if( BG_activated( i, ps->stats ) )
+        s->modelindex2 |= 1 << i;
     }
-  }*/
+  }
 
   //TA: use powerups field to store team/class info:
   s->powerups = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index e4b95260..017e9155 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -680,7 +680,7 @@ static void PM_JetPackMove( void ) {
   if( pm->cmd.upmove > 0.0f )
     wishvel[ 2 ] = 48.0f;
   if( pm->cmd.upmove < 0.0f )
-    wishvel[ 2 ] = -32.0f;
+    wishvel[ 2 ] = -48.0f;
 
   VectorCopy( wishvel, wishdir );
   wishspeed = VectorNormalize( wishdir );
@@ -688,6 +688,8 @@ static void PM_JetPackMove( void ) {
   PM_Accelerate( wishdir, wishspeed, pm_flyaccelerate );
 
   PM_StepSlideMove( qfalse, qfalse );
+
+  PM_ForceLegsAnim( LEGS_LAND );
 }