shuffled cl_light and some of cl_tent into cl_main and remaining cl_tent code into...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 7ee7cc6b8411a293642994e0a2da8bc72e8b303c..1cb2aee65e45a016e71bdf77464d89eb57f1d78a 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -275,7 +275,7 @@ void M_DrawTextBox (float x, float y, float width, float height)
 
 //=============================================================================
 
-int m_save_demonum;
+//int m_save_demonum;
 
 /*
 ================
@@ -297,14 +297,10 @@ void M_ToggleMenu_f (void)
                m_state = m_none;
                return;
        }
-       if (key_dest == key_console)
-       {
-               Con_ToggleConsole_f ();
-       }
-       else
-       {
+       //if (key_dest == key_console)
+       //      Con_ToggleConsole_f ();
+       //else
                M_Menu_Main_f ();
-       }
 }
 
 
@@ -382,11 +378,13 @@ void M_Menu_Main_f (void)
        else
                MAIN_ITEMS = 5;
 
+       /*
        if (key_dest != key_menu)
        {
                m_save_demonum = cls.demonum;
                cls.demonum = -1;
        }
+       */
        key_dest = key_menu;
        m_state = m_main;
        m_entersound = true;
@@ -427,9 +425,9 @@ void M_Main_Key (int key)
        case K_ESCAPE:
                key_dest = key_game;
                m_state = m_none;
-               cls.demonum = m_save_demonum;
-               if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
-                       CL_NextDemo ();
+               //cls.demonum = m_save_demonum;
+               //if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
+               //      CL_NextDemo ();
                break;
 
        case K_DOWNARROW:
@@ -1481,7 +1479,7 @@ void M_Options_Key (int k)
        }
 }
 
-#define        OPTIONS_EFFECTS_ITEMS   12
+#define        OPTIONS_EFFECTS_ITEMS   16
 
 int options_effects_cursor;
 
@@ -1497,7 +1495,11 @@ extern cvar_t r_detailtextures;
 extern cvar_t cl_particles;
 extern cvar_t cl_explosions;
 extern cvar_t cl_stainmaps;
+extern cvar_t r_explosionclip;
+extern cvar_t r_dlightmap;
 extern cvar_t r_modellights;
+extern cvar_t r_coronas;
+extern cvar_t gl_flashblend;
 extern cvar_t cl_particles_bulletimpacts;
 extern cvar_t cl_particles_smoke;
 extern cvar_t cl_particles_sparks;
@@ -1516,36 +1518,48 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
                Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
                break;
        case 1:
-               Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+               Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
                break;
        case 2:
-               Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+               Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
                break;
        case 3:
-               Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
+               Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
                break;
        case 4:
-               Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
+               Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
                break;
        case 5:
-               Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+               Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
                break;
        case 6:
-               Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+               Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
                break;
        case 7:
-               Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+               Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
                break;
        case 8:
-               Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+               Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
                break;
        case 9:
-               Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+               Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
                break;
        case 10:
-               Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+               Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
                break;
        case 11:
+               Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+               break;
+       case 12:
+               Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+               break;
+       case 13:
+               Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+               break;
+       case 14:
+               Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+               break;
+       case 15:
                Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
                break;
        }
@@ -1562,8 +1576,12 @@ void M_Options_Effects_Draw (void)
 
        y = 32;
        M_Print(16, y, "      Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);y += 8;
+       M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8;
+       M_Print(16, y, "               Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8;
+       M_Print(16, y, "      Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8;
        M_Print(16, y, "             Particles");M_DrawCheckbox(220, y, cl_particles.integer);y += 8;
        M_Print(16, y, "            Explosions");M_DrawCheckbox(220, y, cl_explosions.integer);y += 8;
+       M_Print(16, y, "    Explosion Clipping");M_DrawCheckbox(220, y, r_explosionclip.integer);y += 8;
        M_Print(16, y, "             Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.integer);y += 8;
        M_Print(16, y, "      Detail Texturing");M_DrawCheckbox(220, y, r_detailtextures.integer);y += 8;
        M_Print(16, y, "        Bullet Impacts");M_DrawCheckbox(220, y, cl_particles_bulletimpacts.integer);y += 8;
@@ -2111,7 +2129,6 @@ void M_Quit_Key (int key)
 
        case 'Y':
        case 'y':
-               key_dest = key_console;
                Host_Quit_f ();
                break;
 
@@ -2530,6 +2547,7 @@ level_t           transfusionlevels[] =
        {"bb3",                 "Bodies"},
        {"bb4",                 "The Tower"},
        {"bb5",                 "Click!"},
+       {"bb6",                 "Twin Fortress"},
        {"bb7",                 "Midgard"},
        {"bb8",                 "Fun With Heads"},
        {"e1m1",                "Cradle to Grave"},
@@ -2550,21 +2568,21 @@ level_t         transfusionlevels[] =
        {"crypt",               "The Crypt"},
 
        {"bb3_2k1",             "Bodies Infusion"},
+       {"dranzbb6",    "Black Coffee"},
        {"qbb1",                "The Confluence"},
        {"qbb2",                "KathartiK"},
        {"qbb3",                "Caleb's Woodland Retreat"},
-       {"ded_simp",    "Dead Simple"},
-       {"dranzbb6",    "Black Coffee"},
-       {"qe1m7",               "The House of Chthon"}
+       {"qe1m7",               "The House of Chthon"},
+       {"simple",              "Dead Simple"}
 };
 
 episode_t      transfusionepisodes[] =
 {
-       {"Blood", 0, 9},
-       {"Plasma Pack", 9, 4},
-       {"Cryptic Passage", 13, 2},
-       {"Blood 2", 15, 5},
-       {"Custom", 20, 7}
+       {"Blood", 0, 10},
+       {"Plasma Pack", 10, 4},
+       {"Cryptic Passage", 14, 2},
+       {"Blood 2", 16, 5},
+       {"Custom", 21, 7}
 };
 
 gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
@@ -2616,7 +2634,7 @@ void M_Menu_GameOptions_f (void)
        if (maxplayers == 0)
                maxplayers = svs.maxclients;
        if (maxplayers < 2)
-               maxplayers = svs.maxclientslimit;
+               maxplayers = MAX_SCOREBOARD;
 }
 
 
@@ -2765,9 +2783,9 @@ void M_NetStart_Change (int dir)
        {
        case 1:
                maxplayers += dir;
-               if (maxplayers > svs.maxclientslimit)
+               if (maxplayers > MAX_SCOREBOARD)
                {
-                       maxplayers = svs.maxclientslimit;
+                       maxplayers = MAX_SCOREBOARD;
                        m_serverInfoMessage = true;
                        m_serverInfoMessageTime = realtime;
                }