* Toned done the chaingun a touch

* Inverted the direction in which a player is spawned
* Fixed the alien buildable axis explosion bug
* Fixed some class name foul ups in the obituaries
* Disabled friendly fire by default

7 files changed, 20 insertions, 24 deletions

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 9420af94..b027503a 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -79,7 +79,6 @@ Generated a bunch of gibs launching out from a location
 void CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir )
 {
   vec3_t            velocity;
-  int               count;
   particleSystem_t  *ps;
   qhandle_t         gibModel;
   int               i;
@@ -89,7 +88,7 @@ void CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir )
   // allow gibs to be turned off for speed
   if( cg_gibs.integer )
   {
-    for( count = 0; count <= 8; count++ )
+    for( i = 1; i <= 8; i++ )
     {
       velocity[ 0 ] = crandom( ) * GGIB_VELOCITY;
       velocity[ 1 ] = crandom( ) * GGIB_VELOCITY;
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 3a1138e6..891e1371 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -264,13 +264,13 @@ static void CG_Obituary( entityState_t *ent )
       case MOD_LEVEL2_CLAW:
         message = "was clawed by";
         Com_sprintf( className, 64, "'s %s",
-            BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL3 ) );
+            BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL2 ) );
         message2 = className;
         break;
       case MOD_LEVEL2_ZAP:
         message = "was zapped by";
         Com_sprintf( className, 64, "'s %s",
-            BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL3 ) );
+            BG_FindHumanNameForClassNum( PCL_ALIEN_LEVEL2 ) );
         message2 = className;
         break;
       case MOD_LEVEL4_CLAW:
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 7e3cebb3..25bf0dac 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1431,6 +1431,9 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
     }
     else
     {
+      spawn_angles[ YAW ] += 180.0f;
+      AngleNormalize360( spawn_angles[ YAW ] );
+      
       if( spawnPoint->s.origin2[ 2 ] > 0.0f )
       {
         vec3_t  forward, dir;
@@ -1446,6 +1449,11 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
       G_AddPredictableEvent( ent, EV_PLAYER_RESPAWN, 0 );
     }
   }
+  else if( client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
+  {
+    spawn_angles[ YAW ] += 180.0f;
+    AngleNormalize360( spawn_angles[ YAW ] );
+  }
 
   // the respawned flag will be cleared after the attack and jump keys come up
   client->ps.pm_flags |= PMF_RESPAWNED;
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 0e67824f..35bc1e5c 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2291,24 +2291,10 @@ void Cmd_Evolve_Debug_f( gentity_t *ent )
       }
     }
   
-    trap_SendServerCommand( ent - g_entities,
-      va( "print \"i:%d == num:%d\n\"", i, num ) );
-
     if( i == num && client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
     {
       for( j = PCL_NONE + 1; j < PCL_NUM_CLASSES; j++ )
       {
-        trap_SendServerCommand( ent - g_entities,
-          va( "print \"BG_ClassCanEvolveFromTo( %d, %d, %d, 0 ) = %d\n\"",
-            client->ps.stats[ STAT_PCLASS ], j, client->ps.persistant[ PERS_CREDIT ],
-            BG_ClassCanEvolveFromTo( client->ps.stats[ STAT_PCLASS ], j,
-                                     client->ps.persistant[ PERS_CREDIT ], 0 ) ) );
-        
-        trap_SendServerCommand( ent - g_entities,
-          va( "print \"BG_FindStagesForClass( %d, %d ) = %d\n\"",
-            j, g_alienStage.integer,
-            BG_FindStagesForClass( j, g_alienStage.integer ) ) );
-        
         if( BG_ClassCanEvolveFromTo( client->ps.stats[ STAT_PCLASS ], j,
                                      client->ps.persistant[ PERS_CREDIT ], 0 ) >= 0 &&
             BG_FindStagesForClass( j, g_alienStage.integer ) )
@@ -2317,9 +2303,6 @@ void Cmd_Evolve_Debug_f( gentity_t *ent )
           break;
         }
       }
-      
-      trap_SendServerCommand( ent - g_entities,
-        va( "print \"upgrade = %d\n\"", upgrade ) );
     }
   }
 }
diff --git a/src/game/g_main.c b/src/game/g_main.c
index a8ff8c61..239b46d9 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -114,7 +114,7 @@ static cvarTable_t   gameCvarTable[ ] =
 
   { &g_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO, 0, qfalse  },
 
-  { &g_friendlyFire, "g_friendlyFire", "1", CVAR_ARCHIVE, 0, qtrue  },
+  { &g_friendlyFire, "g_friendlyFire", "0", CVAR_ARCHIVE, 0, qtrue  },
 
   { &g_teamAutoJoin, "g_teamAutoJoin", "0", CVAR_ARCHIVE  },
   { &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE  },
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index ebd6dc45..f31c9dde 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -321,6 +321,12 @@ qboolean G_CallSpawn( gentity_t *ent )
     /*if( BG_FindStagesForBuildable( buildable, 1 ) )*/
     if( qtrue )
     {
+      if( buildable == BA_A_SPAWN || buildable == BA_H_SPAWN )
+      {
+        ent->s.angles[ YAW ] += 180.0f;
+        AngleNormalize360( ent->s.angles[ YAW ] );
+      }
+
       G_SpawnBuildable( ent, buildable );
       return qtrue;
     }
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 53e07a0b..0f1da479 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -361,9 +361,9 @@
 
 #define CHAINGUN_PRICE              400
 #define CHAINGUN_BULLETS            200
-#define CHAINGUN_REPEAT             75
+#define CHAINGUN_REPEAT             80
 #define CHAINGUN_SPREAD             1000
-#define CHAINGUN_DMG                HDM(8)
+#define CHAINGUN_DMG                HDM(6)
 
 #define PRIFLE_PRICE                400
 #define PRIFLE_CLIPS                50