Tweak the Effects menu, and add iris adaptation to it as well.

[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..19c2be7df38467788bceb5ac15bba4bd0f1c4c47 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
        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
        ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretEffectsSettingsTab)\r
 entity makeVoretEffectsSettingsTab();\r


@@ -163,8 +163,10 @@ void fillVoretEffectsSettingsTab(entity me)
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:"));\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, 2, e = makeVoretSlider(2, 4, 0.1, "r_bloom_brighten"));\r

                setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);\r
                setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);\r

+       me.TR(me);\r
+               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation"));\r

        me.TR(me);\r
        me.TR(me);\r
                s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");\r
        me.TR(me);\r
        me.TR(me);\r
                s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");\r


@@ -173,10 +175,9 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
                        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, 2, 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
+\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
        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