Options menu has a width of 320, not 640

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 3f37a71c26fab0abc73b3dc8382b532c6befd687..e19376854a310808ff640e38d847403e3d8a64ed 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1112,7 +1112,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 32
+#define OPTIONS_ITEMS 33
 
 int options_cursor;
 
@@ -1127,6 +1127,7 @@ extern cvar_t snd_staticvolume;
 extern cvar_t gl_delayfinish;
 extern cvar_t slowmo;
 extern dllhandle_t jpeg_dll;
+extern cvar_t gl_texture_anisotropy;
 
 void M_Menu_Options_AdjustSliders (int dir)
 {
@@ -1156,6 +1157,8 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
+       else if (options_cursor == optnum++)
+               Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
        else if (options_cursor == optnum++)
@@ -1211,7 +1214,7 @@ void M_Options_PrintCommand(char *s, int enabled)
 {
        if (opty >= 32)
        {
-               DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+               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);
        }
        opty += 8;
@@ -1222,7 +1225,7 @@ void M_Options_PrintCheckbox(char *s, int enabled, int yes)
 {
        if (opty >= 32)
        {
-               DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+               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);
        }
@@ -1234,7 +1237,7 @@ void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, fl
 {
        if (opty >= 32)
        {
-               DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+               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);
        }
@@ -1277,6 +1280,7 @@ void M_Options_Draw (void)
        M_Options_PrintCheckbox("   Texture Combine", true, gl_combine.integer);
        M_Options_PrintCheckbox("         Dithering", true, gl_dither.integer);
        M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer);
+       M_Options_PrintSlider(  "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 0, 8);
        M_Options_PrintSlider(  "        Game Speed", sv.active, slowmo.value, 0, 5);
        M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized, bgmvolume.value, 0, 1);
        M_Options_PrintSlider(  "      Sound Volume", snd_initialized, volume.value, 0, 1);
@@ -1706,7 +1710,7 @@ void M_Options_ColorControl_Key (int k, char ascii)
        switch (k)
        {
        case K_ESCAPE:
-               M_Menu_Main_f ();
+               M_Menu_Options_f ();
                break;
 
        case K_ENTER:
@@ -2142,7 +2146,8 @@ int video_cursor = 0;
 int video_cursor_table[] = {56, 68, 80, 100};
 // note: if modes are added to the beginning of this list, update the
 // video_resolution = x; in M_Menu_Video_f below
-unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}};
+unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}};
+#define VID_RES_COUNT ((int)sizeof(video_resolutions) / sizeof(video_resolutions[0]) - 1)
 int video_resolution;
 
 extern int current_vid_fullscreen;
@@ -2158,7 +2163,7 @@ void M_Menu_Video_f (void)
        m_entersound = true;
 
        // Look for the current resolution
-       for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++)
+       for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++)
        {
                if (video_resolutions[video_resolution][0] == current_vid_width &&
                        video_resolutions[video_resolution][1] == current_vid_height)
@@ -2166,7 +2171,7 @@ void M_Menu_Video_f (void)
        }
 
        // Default to 800x600 if we didn't find it
-       if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+       if (video_resolution == VID_RES_COUNT)
        {
                // may need to update this number if mode list changes
                video_resolution = 4;
@@ -2219,8 +2224,8 @@ void M_Menu_Video_AdjustSliders (int dir)
                {
                        int new_resolution = video_resolution + dir;
                        if (new_resolution < 0)
-                               video_resolution = sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1;
-                       else if (new_resolution > (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1))
+                               video_resolution = VID_RES_COUNT - 1;
+                       else if (new_resolution > VID_RES_COUNT)
                                video_resolution = 0;
                        else
                                video_resolution = new_resolution;
@@ -3730,6 +3735,8 @@ void M_Keydown (int key, char ascii)
 
 void M_Shutdown(void)
 {
+       // reset key_dest
+       key_dest = key_game;
 }
 
 void M_Restart(void)
@@ -3765,7 +3772,11 @@ void MP_Error(void)
        // fall back to the normal menu
 
        // say it
-       Con_Printf("Falling back to normal menu.\n Error :");
+       Con_Printf("Falling back to normal menu\n");
+
+       key_dest = key_game;
+
+       //PRVM_ResetProg();
 
        // init the normal menu now -> this will also correct the menu router pointers
        MR_SetRouting (TRUE);
@@ -3776,6 +3787,9 @@ void MP_Keydown (int key, char ascii)
        PRVM_Begin;
        PRVM_SetProg(PRVM_MENUPROG);
 
+       // set time
+       *prog->time = realtime;
+
        // pass key
        prog->globals[OFS_PARM0] = (float) key;
        prog->globals[OFS_PARM1] = (float) ascii;
@@ -3789,6 +3803,9 @@ void MP_Draw (void)
        PRVM_Begin;
        PRVM_SetProg(PRVM_MENUPROG);
 
+       // set time
+       *prog->time = realtime;
+
        PRVM_ExecuteProgram(m_draw,"");
 
        PRVM_End;
@@ -3799,6 +3816,9 @@ void MP_ToggleMenu_f (void)
        PRVM_Begin;
        PRVM_SetProg(PRVM_MENUPROG);
 
+       // set time
+       *prog->time = realtime;
+
        PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
 
        PRVM_End;
@@ -3809,16 +3829,15 @@ void MP_Shutdown (void)
        PRVM_Begin;
        PRVM_SetProg(PRVM_MENUPROG);
 
+       // set time
+       *prog->time = realtime;
+
        PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),"");
 
        // reset key_dest
        key_dest = key_game;
 
        // AK not using this cause Im not sure whether this is useful at all instead :
-/*     // free mempools
-       Mem_FreePool(prog->edicts_mempool);
-       Mem_FreePool(prog->edictstring_mempool);
-       Mem_FreePool(prog->progs_mempool);*/
        PRVM_ResetProg();
 
        PRVM_End;
@@ -3851,14 +3870,18 @@ void MP_Init (void)
        m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
        m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
 
+       // set time
+       *prog->time = realtime;
+
        // call the prog init
        PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
-       
+
        PRVM_End;
 }
 
 void MP_Restart(void)
 {
+
        MP_Init();
 }
 
@@ -3879,7 +3902,7 @@ void MR_SetRouting(qboolean forceold)
                MR_Draw = M_Draw;
                MR_ToggleMenu_f = M_ToggleMenu_f;
                MR_Shutdown = M_Shutdown;
-               
+
                // init
                if(!m_init)
                {
@@ -3896,7 +3919,7 @@ void MR_SetRouting(qboolean forceold)
                MR_Draw = MP_Draw;
                MR_ToggleMenu_f = MP_ToggleMenu_f;
                MR_Shutdown = MP_Shutdown;
-               
+
                if(!mp_init)
                {
                        MP_Init();
@@ -3917,13 +3940,17 @@ void MR_Init()
 {
        // set router console commands
        Cvar_RegisterVariable (&forceqmenu);
+       Cmd_AddCommand ("menu_restart",MR_Restart);
 
+       // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
        if(COM_CheckParm("-forceqmenu"))
                Cvar_SetValueQuick(&forceqmenu,1);
-
-       Cmd_AddCommand ("menu_restart",MR_Restart);
-       
-       MR_SetRouting (FALSE);
+       // use -useqmenu for debugging proposes, cause it starts
+       // the normal quake menu only the first time
+       else if(COM_CheckParm("-useqmenu"))
+               MR_SetRouting (TRUE);
+       else
+               MR_SetRouting (FALSE);
 }