* Shut up some compiler warnings (but not all of them)

* Move ClientCommand error messages to menu system
* cg_disableWarningDialogs 2 == no messages at all
* decide clientside what kind of dialog to use and merge some redundant menus as a result
* add spec dialog (pretty much identical to human/alien dialogs)

4 files changed, 23 insertions, 30 deletions

diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 6a6869c9..a5d6680c 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -574,6 +574,14 @@ typedef enum
   MN_A_TEAMFULL,
   MN_H_TEAMFULL,
 
+  // cmd stuff
+  MN_CMD_CHEAT,
+  MN_CMD_TEAM,
+  MN_CMD_SPEC,
+  MN_CMD_ALIEN,
+  MN_CMD_HUMAN,
+  MN_CMD_LIVING,
+
   //alien stuff
   MN_A_CLASS,
   MN_A_BUILD,
@@ -584,14 +592,16 @@ typedef enum
   MN_A_TOOCLOSE,
   MN_A_NOOVMND_EVOLVE,
 
+  //shared build
+  MN_B_NOROOM,
+  MN_B_NORMAL,
+
   //alien build
   MN_A_SPWNWARN, // not currently used
   MN_A_ONEOVERMIND,
   MN_A_NOBP,
   MN_A_NOCREEP,
   MN_A_NOOVMND,
-  MN_A_NOROOM,
-  MN_A_NORMAL, // too steep
   MN_A_ONEHOVEL,
   MN_A_HOVEL_EXIT,
   MN_A_TEAMCHANGEBUILDTIMER,
@@ -615,8 +625,6 @@ typedef enum
   MN_H_NOTPOWERED,
   MN_H_NODCC,
   MN_H_ONEREACTOR,
-  MN_H_NOROOM,
-  MN_H_NORMAL, // too steep
   MN_H_TNODEWARN, // not currently used
   MN_H_RPTNOREAC,
   MN_H_RPTPOWERHERE,
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 090b83d6..f641d7ca 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -259,7 +259,7 @@ ClientImpacts
 */
 void ClientImpacts( gentity_t *ent, pmove_t *pm )
 {
-  int       i, j;
+  int       i;
   trace_t   trace;
   gentity_t *other;
 
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 40d2ab7e..ee5a55ce 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2042,8 +2042,7 @@ Used by HMGTurret_Think to track enemy location
 */
 qboolean HMGTurret_TrackEnemy( gentity_t *self )
 {
-  trace_t tr;
-  vec3_t  dirToTarget, dttAdjusted, angleToTarget, angularDiff, xNormal, end;
+  vec3_t  dirToTarget, dttAdjusted, angleToTarget, angularDiff, xNormal;
   vec3_t  refNormal = { 0.0f, 0.0f, 1.0f };
   float   temp, rotAngle, angularSpeed;
 
@@ -3455,17 +3454,11 @@ qboolean G_BuildIfValid( gentity_t *ent, buildable_t buildable )
       return qfalse;
 
     case IBE_NORMAL:
-      if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
-        G_TriggerMenu( ent->client->ps.clientNum, MN_H_NORMAL );
-      else
-        G_TriggerMenu( ent->client->ps.clientNum, MN_A_NORMAL );
+      G_TriggerMenu( ent->client->ps.clientNum, MN_B_NORMAL );
       return qfalse;
 
     case IBE_PERMISSION:
-      if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
-        G_TriggerMenu( ent->client->ps.clientNum, MN_H_NORMAL );
-      else
-        G_TriggerMenu( ent->client->ps.clientNum, MN_A_NORMAL );
+      G_TriggerMenu( ent->client->ps.clientNum, MN_B_NORMAL );
       return qfalse;
 
     case IBE_ONEREACTOR:
@@ -3477,10 +3470,7 @@ qboolean G_BuildIfValid( gentity_t *ent, buildable_t buildable )
       return qfalse;
 
     case IBE_NOROOM:
-      if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
-        G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOROOM );
-      else
-        G_TriggerMenu( ent->client->ps.clientNum, MN_A_NOROOM );
+      G_TriggerMenu( ent->client->ps.clientNum, MN_B_NOROOM );
       return qfalse;
 
     case IBE_NOHUMANBP:
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 2824018a..b530af51 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2964,8 +2964,7 @@ void ClientCommand( int clientNum )
 
   if( cmds[ i ].cmdFlags & CMD_CHEAT && !g_cheats.integer )
   {
-    trap_SendServerCommand( clientNum,
-      "print \"Cheats are not enabled on this server\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_CHEAT );
     return;
   }
 
@@ -2975,31 +2974,28 @@ void ClientCommand( int clientNum )
   if( cmds[ i ].cmdFlags & CMD_TEAM &&
       ent->client->pers.teamSelection == PTE_NONE )
   {
-    trap_SendServerCommand( clientNum, "print \"Join a team first\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_TEAM );
     return;
   }
 
   if( cmds[ i ].cmdFlags & CMD_SPEC &&
       ent->client->sess.sessionTeam != TEAM_SPECTATOR )
   {
-    trap_SendServerCommand( clientNum,
-      "print \"You can only use this command when spectating\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_SPEC );
     return;
   }
 
   if( cmds[ i ].cmdFlags & CMD_ALIEN &&
       ent->client->pers.teamSelection != PTE_ALIENS )
   {
-    trap_SendServerCommand( clientNum,
-      "print \"Must be alien to use this command\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_ALIEN );
     return;
   }
 
   if( cmds[ i ].cmdFlags & CMD_HUMAN &&
       ent->client->pers.teamSelection != PTE_HUMANS )
   {
-    trap_SendServerCommand( clientNum,
-      "print \"Must be human to use this command\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_HUMAN );
     return;
   }
 
@@ -3007,8 +3003,7 @@ void ClientCommand( int clientNum )
     ( ent->client->ps.stats[ STAT_HEALTH ] <= 0 ||
       ent->client->sess.sessionTeam == TEAM_SPECTATOR ) )
   {
-    trap_SendServerCommand( clientNum,
-      "print \"Must be living to use this command\n\"" );
+    G_TriggerMenu( clientNum, MN_CMD_LIVING );
     return;
   }