Added two cvars (sbar_alpha_bg and sbar_alpha_fg) to replace sbar_alpha, one controls...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index ed3e79ce2796950f03038b2aac7c8443f726b821..3c3c5e5437d1fc41443b434db8e386963c5710ae 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -362,6 +362,8 @@ void M_Menu_Main_f (void)
                else
                        MAIN_ITEMS = 6;
        }
+       else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+               MAIN_ITEMS = 6;
        else
                MAIN_ITEMS = 5;
 
@@ -521,6 +523,34 @@ void M_Main_Key (int key, char ascii)
                                break;
                        }
                }
+               else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+               {
+                       switch (m_main_cursor)
+                       {
+                       case 0:
+                               M_Menu_SinglePlayer_f ();
+                               break;
+
+                       case 1:
+                               M_Menu_MultiPlayer_f ();
+                               break;
+
+                       case 2:
+                               M_Menu_Options_f ();
+                               break;
+
+                       case 3:
+                               M_Menu_Help_f ();
+                               break;
+
+                       case 4:
+                               M_Menu_Quit_f ();
+                               break;
+                       case 5:
+                               MR_Restart();
+                               break;
+                       }
+               }
                else
                {
                        switch (m_main_cursor)
@@ -1171,7 +1201,7 @@ void M_DrawCheckbox (int x, int y, int on)
 }
 
 
-#define OPTIONS_ITEMS 37
+#define OPTIONS_ITEMS 40
 
 int options_cursor;
 
@@ -1186,6 +1216,7 @@ extern cvar_t snd_staticvolume;
 extern cvar_t slowmo;
 extern dllhandle_t jpeg_dll;
 extern cvar_t gl_texture_anisotropy;
+extern cvar_t r_textshadow;
 
 void M_Menu_Options_AdjustSliders (int dir)
 {
@@ -1203,6 +1234,10 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
+       else if (options_cursor == optnum++)
+               Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
+       else if (options_cursor == optnum++)
+               Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 1));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
        else if (options_cursor == optnum++)
@@ -1227,6 +1262,8 @@ void M_Menu_Options_AdjustSliders (int dir)
                Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
        else if (options_cursor == optnum++)
                Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
+       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));
        else if (options_cursor == optnum++)
@@ -1333,6 +1370,8 @@ void M_Options_Draw (void)
        M_Options_PrintSlider(  "     Console Speed", true, scr_conspeed.value, 0, 1000);
        M_Options_PrintSlider(  "     Console Alpha", true, scr_conalpha.value, 0, 1);
        M_Options_PrintSlider(  "Conback Brightness", true, scr_conbrightness.value, 0, 1);
+       M_Options_PrintSlider(  "     Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
+       M_Options_PrintSlider(  "     Sbar Alpha FG", true, sbar_alpha_fg.value, 0, 1);
        M_Options_PrintSlider(  "       Screen size", true, scr_viewsize.value, 30, 120);
        M_Options_PrintSlider(  "     Field of View", true, scr_fov.integer, 1, 170);
        M_Options_PrintCheckbox("  JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
@@ -1345,6 +1384,7 @@ void M_Options_Draw (void)
        M_Options_PrintSlider(  "   CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
        M_Options_PrintSlider(  "      Sound Volume", snd_initialized.integer, volume.value, 0, 1);
        M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? "      Music Volume" : "    Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
+       M_Options_PrintCheckbox("       Text Shadow", true, r_textshadow.integer);
        M_Options_PrintSlider(  "         Crosshair", true, crosshair.value, 0, 5);
        M_Options_PrintSlider(  "    Crosshair Size", true, crosshair_size.value, 1, 5);
        M_Options_PrintCheckbox("  Static Crosshair", true, crosshair_static.integer);
@@ -1440,7 +1480,6 @@ void M_Menu_Options_Effects_f (void)
 
 extern cvar_t r_detailtextures;
 extern cvar_t cl_particles;
-extern cvar_t cl_explosions;
 extern cvar_t cl_stainmaps;
 extern cvar_t cl_decals;
 extern cvar_t r_explosionclip;
@@ -1455,6 +1494,7 @@ extern cvar_t cl_particles_bubbles;
 extern cvar_t cl_particles_blood;
 extern cvar_t cl_particles_blood_alpha;
 extern cvar_t cl_particles_blood_bloodhack;
+extern cvar_t cl_particles_explosions_shell;
 extern cvar_t r_lightningbeam_thickness;
 extern cvar_t r_lightningbeam_scroll;
 extern cvar_t r_lightningbeam_repeatdistance;
@@ -1474,7 +1514,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
-       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
@@ -1525,8 +1565,8 @@ void M_Options_Effects_Draw (void)
        M_Options_PrintCheckbox("      Use Only Coronas", true, gl_flashblend.integer);
        M_Options_PrintCheckbox("             Particles", true, cl_particles.integer);
        M_Options_PrintSlider(  "     Particles Quality", true, cl_particles_quality.value, 1, 4);
-       M_Options_PrintCheckbox("            Explosions", true, cl_explosions.integer);
-       M_Options_PrintCheckbox("    Explosion Clipping", true, r_explosionclip.integer);
+       M_Options_PrintCheckbox("       Explosion Shell", true, cl_particles_explosions_shell.integer);
+       M_Options_PrintCheckbox("  Explosion Shell Clip", true, r_explosionclip.integer);
        M_Options_PrintCheckbox("             Stainmaps", true, cl_stainmaps.integer);
        M_Options_PrintCheckbox("                Decals", true, cl_decals.integer);
        M_Options_PrintCheckbox("      Detail Texturing", true, r_detailtextures.integer);
@@ -4219,6 +4259,8 @@ void MR_Init()
 {
        // set router console commands
        Cvar_RegisterVariable (&forceqmenu);
+       if (gamemode == GAME_NETHERWORLD)
+               Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
        Cmd_AddCommand ("menu_restart",MR_Restart);
        Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);