Small tweak to the effects menu

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_settings_effects.c

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index f3f493ebb89247e0d8e1874dc490897eb88b07ea..1a63722965eb85f8ac7561955d334af7da593407 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -3,7 +3,7 @@ CLASS(VoretEffectsSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretEffectsSettingsTab, fill, void(entity))\r
        ATTRIB(VoretEffectsSettingsTab, title, string, "Effects")\r
        ATTRIB(VoretEffectsSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretEffectsSettingsTab, rows, float, 19)\r
+       ATTRIB(VoretEffectsSettingsTab, rows, float, 20)\r
        ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretEffectsSettingsTab)\r
 entity makeVoretEffectsSettingsTab();\r
@@ -57,13 +57,6 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.addValue(e, "Best", "2");\r
                        e.addValue(e, "Insane", "1");\r
                        e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples"));\r
-                       e.addValue(e, "Disabled", "1");\r
-                       e.addValue(e, "2x", "2");\r
-                       e.addValue(e, "4x", "4");\r
-                       e.configureVoretTextSliderValues(e);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Texture quality:"));\r
@@ -81,15 +74,6 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 2.8, e = makeVoretCheckBox(1, "r_picmipworld", "Reduce model texture quality only"));\r
                        setDependent(e, "gl_picmip", 0.5, -0.5);\r
        me.TR(me);\r
-       me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Anisotropy:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("gl_texture_anisotropy"));\r
-                       e.addValue(e, "Disabled", "1");\r
-                       e.addValue(e, "2x", "2");\r
-                       e.addValue(e, "4x", "4");\r
-                       e.addValue(e, "8x", "8");\r
-                       e.addValue(e, "16x", "16");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Particle quality:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(0.1, 1.0, 0.05, "cl_particles_quality"));\r
@@ -97,8 +81,13 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Particle dist.:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(500, 2000, 100, "r_drawparticles_drawdistance"));\r
        me.TR(me);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_particles_rain", "Weather"));\r
+               makeMulti(e, "cl_particles_snow");\r
        me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+       me.TR(me);\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "cl_decals", "Decals"));\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_decals_models", "On models"));\r
+                       setDependent(e, "cl_decals", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Distance:"));\r
@@ -139,31 +128,31 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 3, e = makeVoretRadioButton(1, "gl_flashblend", string_null, "Flash blend approximation"));\r
        me.TR(me);\r
                me.TD(me, 1, 2, e = makeVoretRadioButton(1, "r_shadow_realtime_dlight", string_null, "Realtime dynamic lighting"));\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_realtime_dlight_shadows", "Shadows"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_realtime_dlight_shadows", "Dynamic shadows"));\r
                        setDependent(e, "r_shadow_realtime_dlight", 1, 1);\r
        me.TR(me);\r
                me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_shadow_realtime_world", "Realtime world lighting"));\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_realtime_world_shadows", "Shadows"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_realtime_world_shadows", "World shadows"));\r
                        setDependent(e, "r_shadow_realtime_world", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 1.8, e = makeVoretCheckBox(0, "r_shadow_usenormalmap", "Use normal maps"));\r
                        setDependentOR(e, "r_shadow_realtime_dlight", 1, 1, "r_shadow_realtime_world", 1, 1);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_shadow_shadowmapping", "Soft shadows"));\r
-                       setDependentWeird(e, someShadowCvarIsEnabled);\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(2, 0, "r_shadows", "Ambient shadows"));\r
+                       //setDependentWeird(e, someShadowCvarIsEnabled);\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas", "Coronas"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas", "Coronas"));\r
        me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Occlusion Queries"));\r
                        setDependent(e, "r_coronas", 1, 1);\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_bloom", "High Dynamic Range (HDR)"));\r
                        setDependent(e, "r_hdr", 0, 0);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:"));\r
-               me.TD(me, 1, 2, e = makeVoretSlider(2, 6, 0.1, "r_bloom_brighten"));\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Bloom:"));\r
+               me.TD(me, 1, 2, e = makeVoretSlider(1, 3, 0.1, "r_bloom_brighten"));\r
                setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);\r
        me.TR(me);\r
        me.TR(me);\r
@@ -173,10 +162,10 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.65, 0, "hud_damage", "Screen splashes & Blur")); // must match defaults\r
-               makeMulti(e, "hud_stomach");\r
-               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Sharpening")); // must match defaults\r
-       \r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(1.5, 0, "hud_cartoon", "Cartoon lines"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Content blur"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation", "Armor saturation"));\r
+\r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));\r
 }\r