From bdea2382a6a305a168300cfd42ee1ab0a3e8e048 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Thu, 15 Jan 2004 04:02:21 +0000
Subject: * Reduced FALLING_THRESHOLD slightly * Fixed (id) bug in pmove that
 prevented the jump animation being triggered * Combined EV_PLAYER_RESPAWN and
 EV_ALIEN_EVOLVE

---
 src/game/bg_local.h | 2 +-
 src/game/bg_pmove.c | 6 +++---
 src/game/g_client.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/game')

diff --git a/src/game/bg_local.h b/src/game/bg_local.h
index fc5df698..88dfe5be 100644
--- a/src/game/bg_local.h
+++ b/src/game/bg_local.h
@@ -25,7 +25,7 @@
 
 #define OVERCLIP    1.001f
 
-#define FALLING_THRESHOLD -1000.0f //what vertical speed to start falling sound at
+#define FALLING_THRESHOLD -900.0f //what vertical speed to start falling sound at
       
 
 // all of the locals will be zeroed before each
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index a6b8a63b..9141f472 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1667,10 +1667,10 @@ static void PM_GroundTraceMissed( void )
     // if they aren't in a jumping animation and the ground is a ways away, force into it
     // if we didn't do the trace, the player would be backflipping down staircases
     VectorCopy( pm->ps->origin, point );
-    point[ 2 ] -= 64;
+    point[ 2 ] -= 64.0f;
 
-    pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
-    if( trace.fraction == 1.0 )
+    pm->trace( &trace, pm->ps->origin, NULL, NULL, point, pm->ps->clientNum, pm->tracemask );
+    if( trace.fraction == 1.0f )
     {
       if( pm->cmd.forwardmove >= 0 )
       {
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 29b94512..e6a2450a 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1471,6 +1471,8 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
       VectorNormalize( dir );
 
       VectorScale( dir, UP_VEL, client->ps.velocity );
+      
+      G_AddPredictableEvent( ent, EV_PLAYER_RESPAWN, 0 );
     }
     else
     {
@@ -1500,9 +1502,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
   client->ps.pm_flags |= PMF_TIME_KNOCKBACK;
   client->ps.pm_time = 100;
 
-  //TA: STAT_SPAWNTIME for alien fov effects
   client->respawnTime = level.time;
-  G_AddPredictableEvent( ent, EV_PLAYER_RESPAWN, 0 );
 
   client->inactivityTime = level.time + g_inactivity.integer * 1000;
   client->latched_buttons = 0;
-- 
cgit