client: Add cl_parse.h and move cl_parse prototypes to it

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 481be8784393b9455046bf412bfb0ae8e816b2a2..8dd7693440103fa8333cea295a4d1fb8a5b3633b 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2838,9 +2838,9 @@ video_resolution_t video_resolutions_hardcoded[] =
 // this is the number of the default mode (640x480) in the list above
 int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
 
-#define VIDEO_ITEMS 11
+#define VIDEO_ITEMS 10
 static int video_cursor = 0;
-static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
+static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152};
 static int menu_video_resolution;
 
 video_resolution_t *video_resolutions;
@@ -3287,7 +3287,7 @@ static void M_Quit_Key(cmd_state_t *cmd, int key, int ascii)
 
        case 'Y':
        case 'y':
-               Host_Quit_f(cmd);
+               host.state = host_shutdown;
                break;
 
        default:
@@ -5212,6 +5212,10 @@ void MVM_error_cmd(const char *format, ...)
        va_start (argptr, format);
        dpvsnprintf (errorstring, sizeof(errorstring), format, argptr);
        va_end (argptr);
+
+       if (host.framecount < 3)
+               Sys_Error("Menu_Error: %s\n", errorstring);
+
        Con_Printf( "Menu_Error: %s\n", errorstring );
 
        if( !processingError ) {
@@ -5236,8 +5240,7 @@ void MVM_error_cmd(const char *format, ...)
        R_SelectScene( RST_CLIENT );
 
        // Let video start at least
-       if(host.state != host_init)
-               Host_AbortCurrentFrame();
+       Host_AbortCurrentFrame();
 }
 
 static void MVM_begin_increase_edicts(prvm_prog_t *prog)