Several menu tweaks

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index d59dc6885aea1431c15b09aa1b5f6ad4aaeb6424..9d44a2ea4ee056ddd121b1b330892469fa448d30 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -90,8 +90,8 @@ void fillVoretPlayerSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Field of View:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(60, 130, 1, "fov"));\r
        me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Damage kick:"));\r
-               me.TD(me, 1, 2, e = makeVoretSlider(0, 0.5, 0.05, "v_kicktime"));\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Velocity zoom:"));\r
+               me.TD(me, 1, 2, e = makeVoretSlider(-2, 2, 0.1, "cl_velocityzoom"));\r
        me.TR(me);\r
                sl = makeVoretSlider(0.45, 0.75, 0.05, "cl_bobcycle");\r
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View bobbing:"));\r
@@ -102,9 +102,6 @@ void fillVoretPlayerSettingsTab(entity me)
                sl = makeVoretSlider(0.5, 8, 0.5, "cl_rollangle");\r
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View rolling:"));\r
                me.TD(me, 1, 2, sl);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Velocity zoom:"));\r
-               me.TD(me, 1, 2, e = makeVoretSlider(-2, 2, 0.1, "cl_velocityzoom"));\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Zoom Factor:"));\r
@@ -114,10 +111,6 @@ void fillVoretPlayerSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1, 1, sl, "Zoom speed:"));\r
                me.TD(me, 1, 2, sl);\r
        me.TR(me);\r
-       me.TR(me);\r
-               me.TD(me, 1, 2.8, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music"));\r
-               makeMulti(e, "cl_intermission");\r
-       me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.4);\r
                me.TD(me, 1, 2.2, e = makeVoretButton("Weapon & Crosshair settings...", '0 0 0'));\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 24c7b5641d24d55f8aee01f01acc39be9822a26a..d7bd96528b2e1db33a189f4649977e7bb14c1638 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -6,7 +6,7 @@ CLASS(VoretHudDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")\r
        ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)\r
        ATTRIB(VoretHudDialog, intendedWidth, float, 0.7)\r
-       ATTRIB(VoretHudDialog, rows, float, 20)\r
+       ATTRIB(VoretHudDialog, rows, float, 24)\r
        ATTRIB(VoretHudDialog, columns, float, 4)\r
 ENDCLASS(VoretHudDialog)\r
 #endif\r
@@ -23,6 +23,24 @@ string toStringVoretHudDialog(entity me)
 void fillVoretHudDialog(entity me)\r
 {\r
        entity e, sl;\r
+       me.TR(me);\r
+               me.TD(me, 1, 4, makeVoretTextLabel(0, "Screen settings:"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               sl = makeVoretSlider(0.1, 1, 0.05, "hud_damage");\r
+               me.TD(me, 1, 2, e = makeVoretSliderCheckBox(0, 1, sl, "Splashes:"));\r
+               me.TD(me, 1, 3, sl);\r
+               makeMulti(e, "hud_stomach");\r
+               makeMulti(sl, "hud_stomach");\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "cl_reticle_item_normal", "Zoom reticles"));\r
+               makeMulti(e, "cl_reticle_item_weapon");\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music"));\r
+               makeMulti(e, "cl_intermission");\r
+       me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 4, makeVoretTextLabel(0, "HUD settings:"));\r
        me.TR(me);\r
@@ -63,11 +81,6 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));\r
                me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));\r
                me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));\r
-       me.TR(me);\r
-               me.TDempty(me, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0.5", "Middle left"));\r
-               me.TDempty(me, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0.5", "Middle right"));\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 66381b223bd73f076d5087c2525be9b5574eec76..0db056cecbf0a7725c361e67b90004c0dcbdf01c 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -85,7 +85,7 @@ void fillVoretWeaponsDialog(entity me)
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));\r
                setDependent(e, "crosshair_color_by_health", 0, 0);\r
        me.TR(me);\r
-               me.TDempty(me, 0.3);\r
+               me.TDempty(me, 0.6);\r
                me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));\r
        me.TR(me);\r
        me.TR(me);\r