X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=96524be89316dffbcec8dad55a7194a9b655e652;hp=bf03a1192b25a657c8748486d258f2d3858ad9bf;hb=105428a4c954b354f5b0379d4a210afa3f54710b;hpb=ef23141bb91e4e7d6bc5b582398ae0aa62f95d04

diff --git a/menu.c b/menu.c
index bf03a119..96524be8 100644
--- a/menu.c
+++ b/menu.c
@@ -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++)
@@ -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);