* (bug 3384) Remove server side armoury refresh and replace with UI side

  refresh
* Add trap_Key_SetOverstrikeMode and trap_Key_GetOverstrikeMode to cgame
* Change Text_[Width|Height] to return floats
* Add Text_Em[Width|Height]
* Add CG_AlignText to cut down on code duplication
* Add itemDef_t::textvalignment for vertical text alignment
* Add UI_DrawTextBlock to replace a lot of duplicate code
* Rewrite text wrapping code from scratch so that it actually works
* Add UI_OwnerDrawText
* Add expression evaluator to .menu parser
* Split off Border_Paint from Window_Paint
* Scale slider items to fit their rect
* Rework edit field widgets to behave somewhat more correctly
* Fix a few listbox widget layout issues
* Don't display scrollbars in "notselectable" listbox widgets
* Make scoreboard team labels ownerdrawn
* Menu script rework
  + Use the expression evaluator to replace lots and lots of absolute
    coords with relative ones, hopefully easing future maintenance
  + Remove lots and lots of textalign[xy] that were present to work
    around broken text alignment routines
  + Replace a bunch of numeric constants with ones from menudef.h
  + Compose the huds from tremulous_common_hud.h
  + Generally neaten things up
  + Lots of whitespace fixes

3 files changed, 0 insertions, 28 deletions

diff --git a/src/game/g_active.c b/src/game/g_active.c
index 14c7ad52..ef6330d4 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1683,13 +1683,6 @@ void ClientThink_real( gentity_t *ent )
     }
   }
 
-  if( level.framenum > client->retriggerArmouryMenu && client->retriggerArmouryMenu )
-  {
-    G_TriggerMenu( client->ps.clientNum, MN_H_ARMOURY );
-
-    client->retriggerArmouryMenu = 0;
-  }
-
   // Give clients some credit periodically
   if( ent->client->lastKillTime + FREEKILL_PERIOD < level.time )
   {
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index eb8f6714..66de68f8 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2141,15 +2141,6 @@ void Cmd_Buy_f( gentity_t *ent )
     trap_SendServerCommand( ent-g_entities, va( "print \"Unknown item\n\"" ) );
   }
 
-  if( trap_Argc( ) >= 2 )
-  {
-    trap_Argv( 2, s, sizeof( s ) );
-
-    //retrigger the armoury menu
-    if( !Q_stricmp( s, "retrigger" ) )
-      ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
-  }
-
   //update ClientInfo
   ClientUserinfoChanged( ent->client->ps.clientNum );
 }
@@ -2320,15 +2311,6 @@ void Cmd_Sell_f( gentity_t *ent )
   else
     trap_SendServerCommand( ent-g_entities, va( "print \"Unknown item\n\"" ) );
 
-  if( trap_Argc( ) >= 2 )
-  {
-    trap_Argv( 2, s, sizeof( s ) );
-
-    //retrigger the armoury menu
-    if( !Q_stricmp( s, "retrigger" ) )
-      ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
-  }
-
   //update ClientInfo
   ClientUserinfoChanged( ent->client->ps.clientNum );
 }
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 54600578..c9538bbd 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -455,9 +455,6 @@ struct gclient_s
 
   int                 lastFlameBall;        // s.number of the last flame ball fired
 
-#define RAM_FRAMES  1                       // number of frames to wait before retriggering
-  int                 retriggerArmouryMenu; // frame number to retrigger the armoury menu
-
   unlagged_t          unlaggedHist[ MAX_UNLAGGED_MARKERS ];
   unlagged_t          unlaggedBackup;
   unlagged_t          unlaggedCalc;