* Forced a weapon change when buying a weapon

* Implemented dynamic stage boundaries
* A shedload of balance tweaks
* Inevitably other stuff that I've forgotten whilst SF CVS has been down

4 files changed, 15 insertions, 7 deletions

diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 5120be94..80cd1293 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -291,4 +291,6 @@ void CG_InitConsoleCommands( void )
   trap_AddCommand( "ui_menu" );
   trap_AddCommand( "mapRotation" );
   trap_AddCommand( "stopMapRotation" );
+  trap_AddCommand( "alienWin" );
+  trap_AddCommand( "humanWin" );
 }
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index e7a8efac..5224c5b3 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1899,13 +1899,8 @@ static void CG_DrawLagometer( rectDef_t *rect, qhandle_t shader )
   float   vscale;
   vec4_t  white = { 1.0f, 1.0f, 1.0f, 1.0f };
 
-  if( !cg_lagometer.integer )
-  {
-    if( cg.snap->ps.pm_type != PM_INTERMISSION )
-      CG_DrawDisconnect( );
-
+  if( cg.snap->ps.pm_type == PM_INTERMISSION )
     return;
-  }
 
   //
   // draw the graph
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index ead2e602..3e512204 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -224,7 +224,7 @@ static void CG_Obituary( entityState_t *ent )
         message2 = "'s buildings alone";
         break;
       case MOD_SOLDIER_BITE:
-        message = "was biten by";
+        message = "was bitten by";
         break;
       case MOD_HYDRA_CLAW:
         message = "was swiped by";
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index a385fea6..72d20f6c 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -858,6 +858,17 @@ static void CG_ServerCommand( void )
 
     return;
   }
+
+  if( !strcmp( cmd, "weaponswitch" ) )
+  {
+    if( trap_Argc( ) == 2 )
+    {
+      cg.weaponSelect = atoi( CG_Argv( 1 ) );
+      cg.weaponSelectTime = cg.time;
+    }
+
+    return;
+  }
   
   CG_Printf( "Unknown client game command: %s\n", cmd );
 }