Remove the old saturation slider from the menu, and add the armor based saturation...

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 843d0df23e2f572117cc9d1ac0802e94b8f33343..e6f9a562a584045863c29ea27dd471b2ce5d24e6 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -808,12 +808,12 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("r_glsl_postprocess_uservec2_enable", "0");\r
        }\r
 \r
-       if(cvar("hud_postprocessing") && cvar("hud_saturation"))\r
+       if(cvar("hud_postprocessing"))\r
        {\r
                // change saturation based on the amount of armor we have\r
                // ranges between 0 and 50 armor. 0 armor is saturation 0.5, and 0.5 armor or above is saturation 1\r
 \r
-               if(armor_enabled && spectatee_status != -1 && getstati(STAT_HEALTH) > 0)\r
+               if(cvar("hud_saturation") && armor_enabled && spectatee_status != -1 && getstati(STAT_HEALTH) > 0)\r
                {\r
                        float saturation;\r
                        saturation = 0.5 + (getstati(STAT_ARMOR) * 1 * 0.01);\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 1a75c952abdb757cb43e6f97e09e079fe2401c3d..13ba2ff197ab122b56052e03db8caccc12e2f7ba 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -178,8 +178,9 @@ 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.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur"));\r
                me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Powerup sharpen"));\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

diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c
index 8a32214e60e03826f7944538a0bbe0e39151d1c5..dbba13159061d491ec95dc1275e5132175f6f5af 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_video.c
+++ b/data/qcsrc/menu/voret/dialog_settings_video.c
@@ -88,11 +88,6 @@ void fillVoretVideoSettingsTab(entity me)
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Contrast boost:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(1.0, 5.0, 0.1, "v_contrastboost"));\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Saturation:"));\r
-                       setDependent(e, "vid_gl20", 1, 1);\r
-               me.TD(me, 1, 2, e = makeVoretSlider(0.5, 2.0, 0.05, "r_glsl_saturation"));\r
-                       setDependent(e, "vid_gl20", 1, 1);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_glslgamma", "Use GLSL to handle color control"));\r