* Fixed corpse death pose bug

* Removed extraneous debug info
* Jet pack much faster
* Blocked spawns now nonfunctional

3 files changed, 17 insertions, 28 deletions

diff --git a/src/game/g_client.c b/src/game/g_client.c
index fe220be9..0dfcbebe 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -290,7 +290,7 @@ gentity_t *SelectAlienSpawnPoint( void )
   while( ( spot = G_Find( spot, FOFS( classname ),
     BG_FindEntityNameForBuildable( BA_A_SPAWN ) ) ) != NULL )
   {
-    if( SpotWouldTelefrag( spot ) || ( spot->health <= 0 ) )
+    if( spot->health <= 0 )
       continue;
 
     if( !spot->s.groundEntityNum )
@@ -307,21 +307,16 @@ gentity_t *SelectAlienSpawnPoint( void )
     if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD )
       continue;
 
+    //spawn is blocked
+    if( tr.fraction < 1.0f )
+      continue;
+    
     spots[ count ] = spot;
     count++;
   }
 
   if( !count )
-  {
-    // no spots that won't telefrag
-    spot = G_Find( NULL, FOFS( classname ),
-      BG_FindEntityNameForBuildable( BA_A_SPAWN ) );
-    
-    if( spot->health > 0 )
-      return spot;
-    else
-      return NULL;
-  }
+    return NULL;
 
   selection = rand() % count;
   return spots[ selection ];
@@ -353,7 +348,7 @@ gentity_t *SelectHumanSpawnPoint( void )
   while( ( spot = G_Find( spot, FOFS( classname ),
     BG_FindEntityNameForBuildable( BA_H_SPAWN ) ) ) != NULL )
   {
-    if( SpotWouldTelefrag( spot ) || ( spot->health <= 0 ) )
+    if( spot->health <= 0 )
       continue;
 
     if( !spot->s.groundEntityNum )
@@ -369,21 +364,16 @@ gentity_t *SelectHumanSpawnPoint( void )
     if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD )
       continue;
 
+    //spawn is blocked
+    if( tr.fraction < 1.0f )
+      continue;
+    
     spots[ count ] = spot;
     count++;
   }
 
   if( !count )
-  {
-    // no spots that won't telefrag
-    spot = G_Find( NULL, FOFS( classname ),
-      BG_FindEntityNameForBuildable( BA_H_SPAWN ) );
-    
-    if( spot->health > 0 )
-      return spot;
-    else
-      return NULL;
-  }
+    return NULL;
 
   selection = rand() % count;
   return spots[ selection ];
@@ -1358,11 +1348,11 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn )
   if( client->sess.sessionTeam == TEAM_SPECTATOR )
   {
     if( teamLocal == PTE_NONE )
-      spawnPoint = SelectSpectatorSpawnPoint ( spawn_origin, spawn_angles );
+      spawnPoint = SelectSpectatorSpawnPoint( spawn_origin, spawn_angles );
     else if( teamLocal == PTE_ALIENS )
-      spawnPoint = SelectAlienLockSpawnPoint ( spawn_origin, spawn_angles );
+      spawnPoint = SelectAlienLockSpawnPoint( spawn_origin, spawn_angles );
     else if( teamLocal == PTE_HUMANS )
-      spawnPoint = SelectHumanLockSpawnPoint ( spawn_origin, spawn_angles );
+      spawnPoint = SelectHumanLockSpawnPoint( spawn_origin, spawn_angles );
   }
   else
   {
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 8f472550..17ef67e8 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -693,7 +693,6 @@ float G_CalcDamageModifier( vec3_t point, gentity_t *targ, gentity_t *attacker,
     }
   }
   
-  G_Printf( "%f\n", modifier );
   return modifier;
 }
 
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 7d068c75..7f98afe6 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -363,8 +363,8 @@
 #define BATTPACK_MODIFIER           2.0f //modifier for extra energy storage available
 
 #define JETPACK_PRICE               120
-#define JETPACK_FLOAT_SPEED         48.0f //up movement speed
-#define JETPACK_SINK_SPEED          96.0f //down movement speed
+#define JETPACK_FLOAT_SPEED         256.0f //up movement speed
+#define JETPACK_SINK_SPEED          384.0f //down movement speed
 
 #define BSUIT_PRICE                 200