Removed gl_combine from the menu and let the menu select the dot crosshair

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index f1a1355204e01962b00f9a909a42131de0f6271d..96524be89316dffbcec8dad55a7194a9b655e652 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -830,7 +830,7 @@ void M_ScanSaves (void)
        {
                strcpy (m_filenames[i], "--- UNUSED SLOT ---");
                loadable[i] = false;
-               sprintf (name, "s%i.sav", i);
+               sprintf (name, "s%i.sav", (int)i);
                f = FS_Open (name, "rb", false, false);
                if (!f)
                        continue;
@@ -1449,7 +1449,7 @@ forward:
                        break;
                if (setup_cursor == 0)
                {
-                       l = strlen(setup_myname);
+                       l = (int)strlen(setup_myname);
                        if (l < 15)
                        {
                                setup_myname[l+1] = 0;
@@ -1500,7 +1500,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 40
+#define OPTIONS_ITEMS 39
 
 int options_cursor;
 
@@ -1546,8 +1546,6 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&r_sky, !r_sky.integer);
-       else if (options_cursor == optnum++)
-               Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
        else if (options_cursor == optnum++)
@@ -1563,7 +1561,7 @@ void M_Menu_Options_AdjustSliders (int dir)
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
        else if (options_cursor == optnum++)
-               Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
+               Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
        else if (options_cursor == optnum++)
@@ -1622,7 +1620,7 @@ void M_Options_PrintCheckbox(char *s, int enabled, int yes)
        {
                DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
                M_ItemPrint(0, opty, s, enabled);
-               M_DrawCheckbox(0 + strlen(s) * 8 + 8, opty, yes);
+               M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
        }
        opty += 8;
        optnum++;
@@ -1634,7 +1632,7 @@ void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, fl
        {
                DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
                M_ItemPrint(0, opty, s, enabled);
-               M_DrawSlider(0 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+               M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
        }
        opty += 8;
        optnum++;
@@ -1675,7 +1673,6 @@ void M_Options_Draw (void)
        M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
        M_Options_PrintSlider(  "      JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
        M_Options_PrintCheckbox("               Sky", true, r_sky.integer);
-       M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
        M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
        M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
        M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
@@ -3090,7 +3087,7 @@ void M_Quit_Draw (void)
        int i, l, linelength, firstline, lastline, lines;
        for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
        {
-               if ((l = strlen(m_quit_message[i])))
+               if ((l = (int)strlen(m_quit_message[i])))
                {
                        if (firstline > i)
                                firstline = i;
@@ -3258,7 +3255,7 @@ void M_LanConfig_Key (int key, char ascii)
 
                if (lanConfig_cursor == 2)
                {
-                       l = strlen(lanConfig_joinname);
+                       l = (int)strlen(lanConfig_joinname);
                        if (l < 21)
                        {
                                lanConfig_joinname[l+1] = 0;
@@ -3270,7 +3267,7 @@ void M_LanConfig_Key (int key, char ascii)
                        break;
                if (lanConfig_cursor == 0)
                {
-                       l = strlen(lanConfig_portname);
+                       l = (int)strlen(lanConfig_portname);
                        if (l < 5)
                        {
                                lanConfig_portname[l+1] = 0;
@@ -3676,7 +3673,7 @@ gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisode
 
 typedef struct
 {
-       int gameid;
+       gamemode_t gameid;
        gamelevels_t *notregistered;
        gamelevels_t *registered;
 }
@@ -4115,7 +4112,7 @@ void M_GameOptions_Key (int key, char ascii)
        case K_BACKSPACE:
                if (gameoptions_cursor == 9)
                {
-                       l = strlen(hostname.string);
+                       l = (int)strlen(hostname.string);
                        if (l)
                        {
                                l = min(l - 1, 37);
@@ -4131,7 +4128,7 @@ void M_GameOptions_Key (int key, char ascii)
                        break;
                if (gameoptions_cursor == 9)
                {
-                       l = strlen(hostname.string);
+                       l = (int)strlen(hostname.string);
                        if (l < 37)
                        {
                                memcpy(hostnamebuf, hostname.string, l);
@@ -4612,6 +4609,7 @@ void MR_SetRouting (qboolean forceold);
 
 void MP_Error(const char *format, ...)
 {
+       static qboolean processingError = false;
        char errorstring[4096];
        va_list argptr;
 
@@ -4620,7 +4618,13 @@ void MP_Error(const char *format, ...)
        va_end (argptr);
        Con_Printf( "Menu_Error: %s\n", errorstring );
 
-       PRVM_Crash();
+       if( !processingError ) {
+               processingError = true;
+               PRVM_Crash();
+               processingError = false;
+       } else {
+               Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" );
+       }
 
        // fall back to the normal menu