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

* Improve ckit tutorial text
* Entities.def correction

3 files changed, 7 insertions, 10 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index f04d562f..01f7e046 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -4599,7 +4599,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
   s->weapon = ps->weapon;
   s->groundEntityNum = ps->groundEntityNum;
 
-  //store items held and active items in otherEntityNum
+  //store items held and active items in modelindex and modelindex2
   s->modelindex = 0;
   s->modelindex2 = 0;
   for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ )
@@ -4626,6 +4626,8 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
 
   if( s->generic1 <= WPM_NONE || s->generic1 >= WPM_NUM_WEAPONMODES )
     s->generic1 = WPM_PRIMARY;
+
+  s->otherEntityNum = ps->otherEntityNum;
 }
 
 
@@ -4708,7 +4710,7 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
   s->weapon = ps->weapon;
   s->groundEntityNum = ps->groundEntityNum;
 
-  //store items held and active items in otherEntityNum
+  //store items held and active items in modelindex and modelindex2
   s->modelindex = 0;
   s->modelindex2 = 0;
 
@@ -4736,6 +4738,8 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
 
   if( s->generic1 <= WPM_NONE || s->generic1 >= WPM_NUM_WEAPONMODES )
     s->generic1 = WPM_PRIMARY;
+
+  s->otherEntityNum = ps->otherEntityNum;
 }
 
 /*
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 73c42b99..b0fdb56f 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -304,13 +304,6 @@ void  G_TouchTriggers( gentity_t *ent )
     if( hit->touch )
       hit->touch( hit, ent, &trace );
   }
-
-  // if we didn't touch a jump pad this pmove frame
-  if( ent->client->ps.jumppad_frame != ent->client->ps.pmove_framecount )
-  {
-    ent->client->ps.jumppad_frame = 0;
-    ent->client->ps.jumppad_ent = 0;
-  }
 }
 
 /*
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index abeee458..d57f259f 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -1169,7 +1169,7 @@ void G_UpdateZaps( int msec )
 
           // don't let a high msec value inflate the total damage
           if( damage + zap->damageUsed > LEVEL2_AREAZAP_DMG )
-		damage = LEVEL2_AREAZAP_DMG - zap->damageUsed;
+            damage = LEVEL2_AREAZAP_DMG - zap->damageUsed;
 
           VectorSubtract( target->s.origin, source->s.origin, forward );
           VectorNormalize( forward );