* (bug 3517) connect.menu isn't properly opened on connection

* Partially revert 772
* Strip off trailing '\n' from server denial messages

4 files changed, 25 insertions, 42 deletions

diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c
index 65cfd0b1..71374ab3 100644
--- a/src/ui/ui_atoms.c
+++ b/src/ui/ui_atoms.c
@@ -201,7 +201,7 @@ qboolean UI_ConsoleCommand( int realTime )
   {
     if( Menu_Count( ) > 0 )
     {
-      Menus_CloseAll( qfalse );
+      Menus_CloseAll( );
       if( Menu_Count( ) == 0 )
       {
         trap_Key_SetCatcher( trap_Key_GetCatcher( ) & ~KEYCATCH_UI );
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index a5168bdb..d8389c66 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -169,7 +169,7 @@ intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3,
       return 0;
 
     case UI_IS_FULLSCREEN:
-      return UI_IsFullscreen();
+      return UI_IsFullscreen( );
 
     case UI_SET_ACTIVE_MENU:
       UI_SetActiveMenu( arg0 );
@@ -1479,7 +1479,7 @@ void UI_Load( void )
   UI_LoadMenus( "ui/ingame.txt", qfalse );
   UI_LoadMenus( "ui/tremulous.txt", qfalse );
   UI_LoadHelp( "ui/help.txt" );
-  Menus_CloseAll( qtrue );
+  Menus_CloseAll( );
   Menus_ActivateByName( lastName );
 
 }
@@ -2906,7 +2906,7 @@ static void UI_RunMenuScript( char **args )
       //disallow the menu if it would be empty
 
       if( uiInfo.alienUpgradeCount <= 0 )
-        Menus_CloseAll( qfalse );
+        Menus_CloseAll( );
     }
     else if( Q_stricmp( name, "UpgradeToNewClass" ) == 0 )
     {
@@ -3062,7 +3062,7 @@ static void UI_RunMenuScript( char **args )
     {
       trap_Cmd_ExecuteText( EXEC_APPEND, "disconnect\n" );
       trap_Key_SetCatcher( KEYCATCH_UI );
-      Menus_CloseAll( qtrue );
+      Menus_CloseAll( );
       Menus_ActivateByName( "main" );
     }
     else if( Q_stricmp( name, "ServerSort" ) == 0 )
@@ -3087,7 +3087,7 @@ static void UI_RunMenuScript( char **args )
       trap_Key_SetCatcher( trap_Key_GetCatcher() & ~KEYCATCH_UI );
       trap_Key_ClearStates();
       trap_Cvar_Set( "cl_paused", "0" );
-      Menus_CloseAll( qfalse );
+      Menus_CloseAll( );
     }
     else if( Q_stricmp( name, "voteMap" ) == 0 )
     {
@@ -3928,7 +3928,7 @@ void UI_Init( qboolean inGameLoad )
   UI_LoadMenus( "ui/tremulous.txt", qfalse );
   UI_LoadHelp( "ui/help.txt" );
 
-  Menus_CloseAll( qtrue );
+  Menus_CloseAll( );
 
   trap_LAN_LoadCachedServers();
 
@@ -3958,7 +3958,7 @@ void UI_KeyEvent( int key, qboolean down )
     if( menu )
     {
       if( key == K_ESCAPE && down && !Menus_AnyFullScreenVisible() )
-        Menus_CloseAll( qtrue );
+        Menus_CloseAll( );
       else
         Menu_HandleKey( menu, key, down );
     }
@@ -4015,14 +4015,14 @@ void UI_SetActiveMenu( uiMenuCommand_t menu )
         trap_Key_SetCatcher( trap_Key_GetCatcher() & ~KEYCATCH_UI );
         trap_Key_ClearStates();
         trap_Cvar_Set( "cl_paused", "0" );
-        Menus_CloseAll( qtrue );
+        Menus_CloseAll( );
 
         return;
 
       case UIMENU_MAIN:
         trap_Cvar_Set( "sv_killserver", "1" );
         trap_Key_SetCatcher( KEYCATCH_UI );
-        Menus_CloseAll( qtrue );
+        Menus_CloseAll( );
         Menus_ActivateByName( "main" );
         trap_Cvar_VariableStringBuffer( "com_errorMessage", buf, sizeof( buf ) );
 
@@ -4040,7 +4040,7 @@ void UI_SetActiveMenu( uiMenuCommand_t menu )
         trap_Cvar_Set( "cl_paused", "1" );
         trap_Key_SetCatcher( KEYCATCH_UI );
         UI_BuildPlayerList();
-        Menus_CloseAll( qtrue );
+        Menus_CloseAll( );
         Menus_ActivateByName( "ingame" );
         return;
     }
@@ -4049,7 +4049,7 @@ void UI_SetActiveMenu( uiMenuCommand_t menu )
 
 qboolean UI_IsFullscreen( void )
 {
-  return Menus_AnyFullScreenVisible();
+  return Menus_AnyFullScreenVisible( );
 }
 
 
@@ -4309,7 +4309,7 @@ void UI_DrawConnectScreen( qboolean overlay )
 
   // print any server info (server full, bad version, etc)
   if( cstate.connState < CA_CONNECTED )
-    Text_PaintCenter_AutoWrapped( centerPoint, yStart + 176, 630, 20, scale, colorWhite, cstate.messageString, 0 );
+    Text_PaintCenter( centerPoint, yStart + 176, scale, colorWhite, cstate.messageString, 0 );
 
   if( lastConnState > cstate.connState )
     lastLoadingText[0] = '\0';
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 309b530d..84c31e4e 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -1543,7 +1543,8 @@ static void Menus_Close( menuDef_t *menu )
     Menu_RunCloseScript( menu );
     menu->window.flags &= ~( WINDOW_VISIBLE | WINDOW_HASFOCUS );
 
-    openMenuCount--;
+    if( openMenuCount > 0 )
+      openMenuCount--;
 
     if( openMenuCount > 0 )
       Menus_Activate( menuStack[ openMenuCount - 1 ] );
@@ -1555,23 +1556,22 @@ void Menus_CloseByName( const char *p )
   Menus_Close( Menus_FindByName( p ) );
 }
 
-void Menus_CloseAll( qboolean force )
+void Menus_CloseAll( void )
 {
   int i;
 
-  for( i = 0; i < menuCount; i++ )
+  // Close any menus on the stack first
+  if( openMenuCount > 0 )
   {
-    if( !( Menus[i].window.flags & WINDOW_DONTCLOSEALL ) || force )
-      Menus_Close( &Menus[i] );
-  }
+    for( i = openMenuCount; i > 0; i-- )
+      Menus_Close( menuStack[ i ] );
 
-  if( force )
-  {
     openMenuCount = 0;
-    g_editingField = qfalse;
-    g_waitingForKey = qfalse;
-    g_editItem = NULL;
   }
+
+  // Close all other menus
+  for( i = 0; i < menuCount; i++ )
+    Menus_Close( &Menus[ i ] );
 }
 
 
@@ -7675,20 +7675,6 @@ qboolean MenuParse_visible( itemDef_t *item, int handle )
   return qtrue;
 }
 
-qboolean MenuParse_dontCloseAll( itemDef_t *item, int handle )
-{
-  int i;
-  menuDef_t *menu = ( menuDef_t* )item;
-
-  if( !PC_Int_Parse( handle, &i ) )
-    return qfalse;
-
-  if( i )
-    menu->window.flags |= WINDOW_DONTCLOSEALL;
-
-  return qtrue;
-}
-
 qboolean MenuParse_onOpen( itemDef_t *item, int handle )
 {
   menuDef_t *menu = ( menuDef_t* )item;
@@ -7969,7 +7955,6 @@ keywordHash_t menuParseKeywords[] = {
   {"aspectBias", MenuParse_aspectBias, NULL},
   {"style", MenuParse_style, NULL},
   {"visible", MenuParse_visible, NULL},
-  {"dontCloseAll", MenuParse_dontCloseAll, NULL},
   {"onOpen", MenuParse_onOpen, NULL},
   {"onClose", MenuParse_onClose, NULL},
   {"onESC", MenuParse_onESC, NULL},
@@ -8281,4 +8266,3 @@ static qboolean Menu_OverActiveItem( menuDef_t *menu, float x, float y )
 
   return qfalse;
 }
-
diff --git a/src/ui/ui_shared.h b/src/ui/ui_shared.h
index 36d77bf8..a33d9ae6 100644
--- a/src/ui/ui_shared.h
+++ b/src/ui/ui_shared.h
@@ -64,7 +64,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define WINDOW_POPUP          0x00200000  // popup
 #define WINDOW_BACKCOLORSET    0x00400000  // backcolor was explicitly set
 #define WINDOW_TIMEDVISIBLE    0x00800000  // visibility timing ( NOT implemented )
-#define WINDOW_DONTCLOSEALL    0x01000000  // don't close during Menus_CloseAll()
 
 
 // CGAME cursor type bits
@@ -464,7 +463,7 @@ menuDef_t *Menus_FindByName( const char *p );
 void Menus_CloseByName( const char *p );
 void Display_HandleKey( int key, qboolean down, int x, int y );
 void LerpColor( vec4_t a, vec4_t b, vec4_t c, float t );
-void Menus_CloseAll( qboolean force );
+void Menus_CloseAll( void );
 void Menu_Paint( menuDef_t *menu, qboolean forcePaint );
 void Menu_SetFeederSelection( menuDef_t *menu, int feeder, int index, const char *name );
 void Display_CacheAll( void );