Rudimentary staging code. Simplified building rules - they were over complex

6 files changed, 50 insertions, 103 deletions

diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 0d22015d..697796de 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -186,68 +186,6 @@ static void CG_StartOrbit_f( void ) {
 
 /*
 ==================
-CG_ClientMenu
-==================
-*/
-static void CG_ClientMenu( const char *menuname )
-{
-  char  menuDef[ MAX_STRING_CHARS ];
-  int   i, j = 0;
-  
-  if( !Q_stricmp( menuname, "dinfest" ) )
-  {
-    strcpy( menuDef, "5,5|Infest|0.976,0.957,0.0,1.0|0.933,0.612,0.0,1.0|0.976,0.957,0.0,1.0|1|16|" );
-    for( i = PCL_NONE + 1; i < PCL_NUM_CLASSES; i++ )
-    {
-      if( BG_ClassCanEvolveFromTo( cg.snap->ps.stats[ STAT_PCLASS ], i ) )
-      {
-        strcat( menuDef, va( "%s, class %s|", BG_FindNameForClassNum( i ), BG_FindNameForClassNum( i ) ) );
-        j++;
-      }
-    }
-    strcat( menuDef, "|Choose a class|to evolve to" );
-    
-    if( j )
-    {
-      trap_SendConsoleCommand( va( "defmenu infest \"%s\"\n", menuDef ) );
-      trap_SendConsoleCommand( "menu infest\n" );
-      trap_SendConsoleCommand( "undefmenu infest\n" );
-    }
-  }
-  else if( !Q_stricmp( menuname, "hmcusell" ) )
-  {
-    strcpy( menuDef, "5,5|Sell|1,1,1,1|0.000,0.412,0.702,1|1,1,1,1|2|32|" );
-    for( i = WP_NONE +1; i < WP_NUM_WEAPONS; i++ )
-    {
-      if( BG_gotWeapon( i, cg.snap->ps.stats ) )
-        strcat( menuDef, va( "%s, sell %s|", BG_FindHumanNameForWeapon( i ), BG_FindNameForWeapon( i ) ) );
-    }
-    for( i = UP_NONE +1; i < UP_NUM_UPGRADES; i++ )
-    {
-      if( BG_gotItem( i, cg.snap->ps.stats ) )
-        strcat( menuDef, va( "%s, sell %s|", BG_FindHumanNameForUpgrade( i ), BG_FindNameForUpgrade( i ) ) );
-    }
-    strcat( menuDef, "Previous, menu hmcumenu||Choose an item|to sell" );
-    
-    trap_SendConsoleCommand( va( "defmenu mcusell \"%s\"\n", menuDef ) );
-    trap_SendConsoleCommand( "menu mcusell\n" );
-    trap_SendConsoleCommand( "undefmenu mcusell\n" );
-  }
-  else if( !Q_stricmp( menuname, "hbankstat" ) )
-  {
-    //FIXME: implement this
-    strcpy( menuDef, "5,5|Statement|1,1,1,1|0.000,0.412,0.702,1|1,1,1,1|2|32|You have something in this bank|OK,!" );
-    
-    trap_SendConsoleCommand( va( "defmenu bankstat \"%s\"\n", menuDef ) );
-    trap_SendConsoleCommand( "menu bankstat\n" );
-    trap_SendConsoleCommand( "undefmenu bankstat\n" );
-  }
-  else
-    trap_SendConsoleCommand( va( "%s not defined", menuname ) );
-}
-
-/*
-==================
 CG_DecodeMP3_f
 ==================
 */
@@ -320,7 +258,6 @@ qboolean CG_ConsoleCommand( void ) {
   if( !Q_stricmp( cmd, "ui_menu" ) )
   {
     arg1 = CG_Argv( 1 );
-    /*CG_ClientMenu( arg1 );*/
     trap_SendConsoleCommand( va( "menu %s\n", arg1 ) );
     return qtrue;
   }
@@ -393,8 +330,6 @@ void CG_InitConsoleCommands( void ) {
   trap_AddCommand ("destroy");
   trap_AddCommand ("torch");
   trap_AddCommand ("menu");
-  trap_AddCommand ("defmenu");
-  trap_AddCommand ("undefmenu");
   trap_AddCommand ("ui_menu");
   trap_AddCommand ("loaddefered");  // spelled wrong, but not changing for demo
 }
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index e0c8d768..069ea844 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -528,9 +528,9 @@ static void CG_DrawStatusBar( void ) {
   #define PWR_Y      20
   if( ps->stats[ STAT_PTEAM ] == PTE_HUMANS )
   {
-    float total = cgs.hBuildPointsTotal;
-    float allocated = total - cgs.hBuildPoints;
-    float powered = total - cgs.hBuildPointsPowered;
+    float total = cgs.humanBuildPointsTotal;
+    float allocated = total - cgs.humanBuildPoints;
+    float powered = total - cgs.humanBuildPointsPowered;
 
     int awidth = (int)( ( allocated / total ) * PWR_WIDTH );
     int pwidth = (int)( ( powered / total ) * PWR_WIDTH );
@@ -566,8 +566,8 @@ static void CG_DrawStatusBar( void ) {
   #define HV_Y      20
   if( ps->stats[ STAT_PTEAM ] == PTE_ALIENS )
   {
-    float total = cgs.dBuildPointsTotal;
-    float allocated = total - cgs.dBuildPoints;
+    float total = cgs.alienBuildPointsTotal;
+    float allocated = total - cgs.alienBuildPoints;
 
     int awidth = (int)( ( allocated / total ) * HV_WIDTH );
     vec4_t bcolor = { 0.5, 0.5, 0.5, 0.5 };
@@ -1015,9 +1015,9 @@ static float CG_DrawPoints( float y )
   team = cg.snap->ps.stats[ STAT_PTEAM ];
   
   if( team == PTE_ALIENS )
-    buildpoints = cgs.dBuildPoints;
+    buildpoints = cgs.alienBuildPoints;
   else if( team == PTE_HUMANS )
-    buildpoints = cgs.hBuildPoints;
+    buildpoints = cgs.humanBuildPoints;
 
   spectator = ( team == PTE_NONE );
 
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 14ea9a74..20725c36 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -408,6 +408,23 @@ void CG_Menu( int eventParm )
 
   *carriageCvar = 0;
   
+  //determine what the player is carrying
+  for( i = WP_NONE +1; i < WP_NUM_WEAPONS; i++ )
+  {
+    if( BG_gotWeapon( i, cg.snap->ps.stats ) )
+      strcat( carriageCvar, va( "W%d ", i ) );
+  }
+  for( i = UP_NONE +1; i < UP_NUM_UPGRADES; i++ )
+  {
+    if( BG_gotItem( i, cg.snap->ps.stats ) )
+      strcat( carriageCvar, va( "U%d ", i ) );
+  }
+  strcat( carriageCvar, "$" );
+  
+  trap_Cvar_Set( "ui_carriage", carriageCvar );
+  
+  trap_Cvar_Set( "ui_stages", va( "%d %d", cgs.alienStage, cgs.humanStage ) );
+  
   switch( eventParm )
   {
     case MN_TEAM:       trap_SendConsoleCommand( "menu tremulous_teamselect\n" );                 break;
@@ -415,22 +432,7 @@ void CG_Menu( int eventParm )
     case MN_H_SPAWN:    trap_SendConsoleCommand( "menu tremulous_humanitem\n" );                  break;
     case MN_A_BUILD:    trap_SendConsoleCommand( "menu tremulous_alienbuild\n" );                 break;
     case MN_H_BUILD:    trap_SendConsoleCommand( "menu tremulous_humanbuild\n" );                 break;
-    case MN_H_MCU:
-      for( i = WP_NONE +1; i < WP_NUM_WEAPONS; i++ )
-      {
-        if( BG_gotWeapon( i, cg.snap->ps.stats ) )
-          strcat( carriageCvar, va( "W%d ", i ) );
-      }
-      for( i = UP_NONE +1; i < UP_NUM_UPGRADES; i++ )
-      {
-        if( BG_gotItem( i, cg.snap->ps.stats ) )
-          strcat( carriageCvar, va( "U%d ", i ) );
-      }
-      strcat( carriageCvar, "$" );
-          
-      trap_Cvar_Set( "ui_carriage", carriageCvar );
-      trap_SendConsoleCommand( "menu tremulous_humanmcu\n" );
-      break;
+    case MN_H_MCU:      trap_SendConsoleCommand( "menu tremulous_humanmcu\n" );                   break;
     case MN_H_BANK:     trap_SendConsoleCommand( "menu tremulous_humanbank\n" );                  break;
     case MN_H_NOROOM:   trap_SendConsoleCommand( "menu tremulous_human_no_room\n" );              break;
     case MN_H_NOPOWER:  trap_SendConsoleCommand( "menu tremulous_human_no_power\n" );             break;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 514cc3c5..5ffedbd6 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1030,11 +1030,14 @@ typedef struct {
 
   qboolean  newHud;
 
-  int       dBuildPoints;
-  int       dBuildPointsTotal;
-  int       hBuildPoints;
-  int       hBuildPointsTotal;
-  int       hBuildPointsPowered;
+  int       alienBuildPoints;
+  int       alienBuildPointsTotal;
+  int       humanBuildPoints;
+  int       humanBuildPointsTotal;
+  int       humanBuildPointsPowered;
+
+  int       alienStage;
+  int       humanStage;
 
   //
   // locally derived information from gamestate
@@ -1219,6 +1222,7 @@ extern  vmCvar_t    cg_smoothTime;
 //TA: hack to get class an carriage through to UI module
 extern  vmCvar_t    ui_currentClass;
 extern  vmCvar_t    ui_carriage;
+extern  vmCvar_t    ui_stages;
 
 //
 // cg_main.c
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 0052b426..1e923b5b 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -182,6 +182,7 @@ vmCvar_t  cg_smoothTime;
 //TA: hack to get class an carriage through to UI module
 vmCvar_t  ui_currentClass;
 vmCvar_t  ui_carriage;
+vmCvar_t  ui_stages;
 
 
 typedef struct {
@@ -267,6 +268,7 @@ static cvarTable_t   cvarTable[] = {
   
   { &ui_currentClass, "ui_currentClass", "0", 0 },
   { &ui_carriage, "ui_carriage", "", 0 },
+  { &ui_stages, "ui_stages", "0 0", 0 },
 
   // the following variables are created in other parts of the system,
   // but we also reference them here
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 8877b389..09b7704e 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -179,11 +179,13 @@ void CG_SetConfigValues( void ) {
 	cgs.scores2 = atoi( CG_ConfigString( CS_SCORES2 ) );
 
   sscanf( CG_ConfigString( CS_BUILDPOINTS ),
-          "%d %d %d %d %d", &cgs.dBuildPoints,
-                            &cgs.dBuildPointsTotal,
-                            &cgs.hBuildPoints,
-                            &cgs.hBuildPointsTotal,
-                            &cgs.hBuildPointsPowered );
+          "%d %d %d %d %d", &cgs.alienBuildPoints,
+                            &cgs.alienBuildPointsTotal,
+                            &cgs.humanBuildPoints,
+                            &cgs.humanBuildPointsTotal,
+                            &cgs.humanBuildPointsPowered );
+
+  sscanf( CG_ConfigString( CS_STAGES ), "%d %d", &cgs.alienStage, &cgs.humanStage );
   
 	cgs.levelStartTime = atoi( CG_ConfigString( CS_LEVEL_START_TIME ) );
   if( cgs.gametype == GT_CTF ) {
@@ -267,11 +269,13 @@ static void CG_ConfigStringModified( void ) {
 	} else if ( num == CS_SCORES2 ) {
 		cgs.scores2 = atoi( str );
   } else if( num == CS_BUILDPOINTS ) {
-    sscanf( str, "%d %d %d %d %d", &cgs.dBuildPoints,
-                                   &cgs.dBuildPointsTotal,
-                                   &cgs.hBuildPoints,
-                                   &cgs.hBuildPointsTotal,
-                                   &cgs.hBuildPointsPowered );
+    sscanf( str, "%d %d %d %d %d", &cgs.alienBuildPoints,
+                                   &cgs.alienBuildPointsTotal,
+                                   &cgs.humanBuildPoints,
+                                   &cgs.humanBuildPointsTotal,
+                                   &cgs.humanBuildPointsPowered );
+  } else if( num == CS_STAGES ) {
+    sscanf( str, "%d %d", &cgs.alienStage, &cgs.humanStage );
 	} else if ( num == CS_LEVEL_START_TIME ) {
 		cgs.levelStartTime = atoi( str );
 	} else if ( num == CS_VOTE_TIME ) {