Properly fix the menu to use the current settings

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index 6103df413d3e926b4f0afda85387c059c78e5f54..95033997842abd540b82bd6f6780711967ef5653 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -85,9 +85,6 @@ void fillVoretPlayerSettingsTab(entity me)
        me.TR(me);\r
                me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1, -1, "cl_vore_stomachmodel", "Stomach model"));\r
                setDependent(e, "chase_active", 0, 0);\r
-       me.TR(me);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.65, 0, "hud_damage", "Screen splashes")); // must match defaults\r
-               makeMulti(e, "hud_stomach");\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Field of View:"));\r

diff --git a/data/qcsrc/menu/voret/dialog_settings.c b/data/qcsrc/menu/voret/dialog_settings.c
index dc0595beb75e8ed5871c78b97570319530acc28a..feabe67c482c4dc361ff97e811a8af8ca272c39d 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings.c
+++ b/data/qcsrc/menu/voret/dialog_settings.c
@@ -4,7 +4,7 @@ CLASS(VoretSettingsDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretSettingsDialog, title, string, "Settings")\r
        ATTRIB(VoretSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS)\r
        ATTRIB(VoretSettingsDialog, intendedWidth, float, 0.96)\r
-       ATTRIB(VoretSettingsDialog, rows, float, 22)\r
+       ATTRIB(VoretSettingsDialog, rows, float, 21)\r
        ATTRIB(VoretSettingsDialog, columns, float, 6)\r
 ENDCLASS(VoretSettingsDialog)\r
 #endif\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_audio.c b/data/qcsrc/menu/voret/dialog_settings_audio.c
index 2b057062f1e601a0d293665e1ecec1d4d69b3270..5eb38bbe4bcc9ca857f1a0c1091cb300ed97e5c4 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_audio.c
+++ b/data/qcsrc/menu/voret/dialog_settings_audio.c
@@ -3,7 +3,7 @@ CLASS(VoretAudioSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretAudioSettingsTab, fill, void(entity))\r
        ATTRIB(VoretAudioSettingsTab, title, string, "Audio")\r
        ATTRIB(VoretAudioSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretAudioSettingsTab, rows, float, 20)\r
+       ATTRIB(VoretAudioSettingsTab, rows, float, 19)\r
        ATTRIB(VoretAudioSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretAudioSettingsTab)\r
 entity makeVoretAudioSettingsTab();\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 7de66b0d5852eed8911857c2d66722f2d3246ed6..f3f493ebb89247e0d8e1874dc490897eb88b07ea 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, 20)\r
+       ATTRIB(VoretEffectsSettingsTab, rows, float, 19)\r
        ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretEffectsSettingsTab)\r
 entity makeVoretEffectsSettingsTab();\r
@@ -173,11 +173,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 = makeVoretCheckBox(0, "hud_damage", "Damage & Water blur"));\r
-               me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_powerup", "Sharpening"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "* damage blur requires 'screen splashes'"));\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.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_input.c b/data/qcsrc/menu/voret/dialog_settings_input.c
index a58b613dcd6c22f6665b8492e8aa0523d34cf3c6..a5771b8678380e3f99d22b61e5740930c8f8d6db 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_input.c
+++ b/data/qcsrc/menu/voret/dialog_settings_input.c
@@ -3,7 +3,7 @@ CLASS(VoretInputSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretInputSettingsTab, fill, void(entity))\r
        ATTRIB(VoretInputSettingsTab, title, string, "Input")\r
        ATTRIB(VoretInputSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretInputSettingsTab, rows, float, 20)\r
+       ATTRIB(VoretInputSettingsTab, rows, float, 19)\r
        ATTRIB(VoretInputSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretInputSettingsTab)\r
 entity makeVoretInputSettingsTab();\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_misc.c b/data/qcsrc/menu/voret/dialog_settings_misc.c
index 0f646e2bdb6476e519057ef6e923bd00caf2c76e..4e353d163d09525b4d11cc384d299219a3c069f1 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_misc.c
+++ b/data/qcsrc/menu/voret/dialog_settings_misc.c
@@ -3,7 +3,7 @@ CLASS(VoretMiscSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretMiscSettingsTab, fill, void(entity))\r
        ATTRIB(VoretMiscSettingsTab, title, string, "Misc")\r
        ATTRIB(VoretMiscSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretMiscSettingsTab, rows, float, 20)\r
+       ATTRIB(VoretMiscSettingsTab, rows, float, 19)\r
        ATTRIB(VoretMiscSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretMiscSettingsTab)\r
 entity makeVoretMiscSettingsTab();\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_network.c b/data/qcsrc/menu/voret/dialog_settings_network.c
index 4b76e7cceb8dbbbc7e376d2ba0d15405eb1b2fd1..d705eb11207afb03f0bf1a64813922f4ce78dff2 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_network.c
+++ b/data/qcsrc/menu/voret/dialog_settings_network.c
@@ -3,7 +3,7 @@ CLASS(VoretNetworkSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretNetworkSettingsTab, fill, void(entity))\r
        ATTRIB(VoretNetworkSettingsTab, title, string, "Network")\r
        ATTRIB(VoretNetworkSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretNetworkSettingsTab, rows, float, 20)\r
+       ATTRIB(VoretNetworkSettingsTab, rows, float, 19)\r
        ATTRIB(VoretNetworkSettingsTab, columns, float, 6.5)\r
 ENDCLASS(VoretNetworkSettingsTab)\r
 entity makeVoretNetworkSettingsTab();\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c
index 8a32214e60e03826f7944538a0bbe0e39151d1c5..ede4ff2834103b5db9edb6e7b9d924322eadcb9c 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_video.c
+++ b/data/qcsrc/menu/voret/dialog_settings_video.c
@@ -3,7 +3,7 @@ CLASS(VoretVideoSettingsTab) EXTENDS(VoretTab)
        METHOD(VoretVideoSettingsTab, fill, void(entity))\r
        ATTRIB(VoretVideoSettingsTab, title, string, "Video")\r
        ATTRIB(VoretVideoSettingsTab, intendedWidth, float, 0.9)\r
-       ATTRIB(VoretVideoSettingsTab, rows, float, 20)\r
+       ATTRIB(VoretVideoSettingsTab, rows, float, 19)\r
        ATTRIB(VoretVideoSettingsTab, columns, float, 6.5)\r
        ATTRIB(VoretVideoSettingsTab, name, string, "videosettings")\r
 ENDCLASS(VoretVideoSettingsTab)\r