fix a typo

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index b993058170650cf1a65a5f7542e706e00c9af719..283728f0a616bc23e22f2242459a5b696ceb7f52 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -186,6 +186,11 @@ void M_DrawCharacter (float cx, float cy, int num)
        DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
 }
 
+void M_PrintColored(float cx, float cy, const char *str)
+{
+       DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
+}
+
 void M_Print(float cx, float cy, const char *str)
 {
        DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
@@ -1303,7 +1308,7 @@ void M_Setup_Draw (void)
 
        M_Print(64, 40, "Your name");
        M_DrawTextBox (160, 32, 16, 1);
-       M_Print(168, 40, setup_myname);
+       M_PrintColored(168, 40, setup_myname);
 
        if (gamemode != GAME_GOODVSBAD2)
        {
@@ -1446,7 +1451,7 @@ forward:
                break;
 
        default:
-               if (ascii < 32 || ascii > 126)
+               if (ascii < 32)
                        break;
                if (setup_cursor == 0)
                {
@@ -1501,7 +1506,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 39
+#define OPTIONS_ITEMS 40
 
 int options_cursor;
 
@@ -1545,6 +1550,8 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
+       else if (options_cursor == optnum++)
+               Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&r_sky, !r_sky.integer);
        else if (options_cursor == optnum++)
@@ -1673,6 +1680,7 @@ void M_Options_Draw (void)
        M_Options_PrintSlider(  "     Field of View", true, scr_fov.integer, 1, 170);
        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_PrintSlider(  "  Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4);
        M_Options_PrintCheckbox("               Sky", true, r_sky.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);
@@ -3244,7 +3252,7 @@ void M_LanConfig_Key (int key, char ascii)
                break;
 
        default:
-               if (ascii < 32 || ascii > 126)
+               if (ascii < 32)
                        break;
 
                if (lanConfig_cursor == 2)
@@ -4132,7 +4140,7 @@ void M_GameOptions_Key (int key, char ascii)
                break;
 
        default:
-               if (ascii < 32 || ascii > 126)
+               if (ascii < 32)
                        break;
                if (gameoptions_cursor == 9)
                {
@@ -4192,8 +4200,8 @@ void M_ServerList_Draw (void)
                for (n = start;n < end;n++)
                {
                        DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-                       M_Print(0, y, serverlist_viewlist[n]->line1);y += 8;
-                       M_Print(0, y, serverlist_viewlist[n]->line2);y += 8;
+                       M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
+                       M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
                }
        }
        else if (realtime - masterquerytime < 3)