* Add otherEntityNum to playerState_t... and don't use it... yet

* Improve ckit tutorial text
* Entities.def correction

3 files changed, 18 insertions, 12 deletions

diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 8c4bc8e3..926d9881 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -387,13 +387,6 @@ static void CG_TouchTriggerPrediction( void )
     if( ent->eType == ET_TELEPORT_TRIGGER )
       cg.hyperspace = qtrue;
   }
-
-  // if we didn't touch a jump pad this pmove frame
-  if( cg.predictedPlayerState.jumppad_frame != cg.predictedPlayerState.pmove_framecount )
-  {
-    cg.predictedPlayerState.jumppad_frame = 0;
-    cg.predictedPlayerState.jumppad_ent = 0;
-  }
 }
 
 
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c
index 1499daef..be3cc37c 100644
--- a/src/cgame/cg_tutorial.c
+++ b/src/cgame/cg_tutorial.c
@@ -141,11 +141,12 @@ static const char *CG_KeyNameForCommand( const char *command )
 CG_BuildableInRange
 ===============
 */
-static qboolean CG_BuildableInRange( playerState_t *ps )
+static qboolean CG_BuildableInRange( playerState_t *ps, float *healthFraction )
 {
   vec3_t        view, point;
   trace_t       trace;
   entityState_t *es;
+  int           health;
 
   AngleVectors( cg.refdefViewAngles, view, NULL, NULL );
   VectorMA( cg.refdef.vieworg, 64, view, point );
@@ -154,6 +155,12 @@ static qboolean CG_BuildableInRange( playerState_t *ps )
 
   es = &cg_entities[ trace.entityNum ].currentState;
 
+  if( healthFraction )
+  {
+    health = es->generic1 & ~( B_POWERED_TOGGLEBIT | B_DCCED_TOGGLEBIT | B_SPAWNED_TOGGLEBIT );
+    *healthFraction = (float)health / B_HEALTH_SCALE;
+  }
+
   if( es->eType == ET_BUILDABLE &&
       ps->stats[ STAT_PTEAM ] == BG_FindTeamForBuildable( es->modelindex ) )
     return qtrue;
@@ -188,7 +195,7 @@ static void CG_AlienBuilderText( char *text, playerState_t *ps )
         va( "Press %s to build a structure\n",
           CG_KeyNameForCommand( "+attack" ) ) );
 
-    if( CG_BuildableInRange( ps ) )
+    if( CG_BuildableInRange( ps, NULL ) )
     {
       Q_strcat( text, MAX_TUTORIAL_TEXT,
           va( "Press %s to destroy this structure\n",
@@ -326,6 +333,7 @@ CG_HumanCkitText
 static void CG_HumanCkitText( char *text, playerState_t *ps )
 {
   buildable_t buildable = ps->stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT;
+  float       health;
 
   if( buildable > BA_NONE )
   {
@@ -345,8 +353,15 @@ static void CG_HumanCkitText( char *text, playerState_t *ps )
         va( "Press %s to build a structure\n",
           CG_KeyNameForCommand( "+attack" ) ) );
 
-    if( CG_BuildableInRange( ps ) )
+    if( CG_BuildableInRange( ps, &health ) )
     {
+      if( health < 1.0f )
+      {
+        Q_strcat( text, MAX_TUTORIAL_TEXT,
+            va( "Hold %s to repair this structure\n",
+              CG_KeyNameForCommand( "+button5" ) ) );
+      }
+
       Q_strcat( text, MAX_TUTORIAL_TEXT,
           va( "Press %s to destroy this structure\n",
             CG_KeyNameForCommand( "deconstruct" ) ) );
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index 7b79fc5d..64e6e927 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -1047,8 +1047,6 @@ void CG_AddViewWeapon( playerState_t *ps )
     return;
 
   // drop gun lower at higher fov
-  //if ( cg_fov.integer > 90 ) {
-  //TA: the client side variable isn't used ( shouldn't iD have done this anyway? )
   if( cg.refdef.fov_y > 90 )
     fovOffset = -0.4 * ( cg.refdef.fov_y - 90 );
   else