Add menu selectors for all crosshairs

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 089e3ef088e04daf1ff494ad9e09640c56499f36..056260e9f093bdd9cfcf6931797d09693cfa14a8 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog)
        METHOD(VoretWeaponsDialog, showNotify, void(entity))\r
        ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r
-       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.7)\r
+       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 1)\r
        ATTRIB(VoretWeaponsDialog, rows, float, 20)\r
-       ATTRIB(VoretWeaponsDialog, columns, float, 4)\r
+       ATTRIB(VoretWeaponsDialog, columns, float, 8)\r
        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r
 #endif\r
@@ -51,7 +51,7 @@ void fillVoretWeaponsDialog(entity me)
        me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Crosshair:"));\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Unarmed style:"));\r
                for(i = 1; i <= 10; ++i) {\r
                        me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0');\r
                }\r
@@ -61,6 +61,31 @@ void fillVoretWeaponsDialog(entity me)
                for(i = 11; i <= 20; ++i) {\r
                        me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0');\r
                }\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Primary style:"));\r
+               for(i = 1; i <= 10; ++i) {\r
+                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_primary"), '1 1 0');\r
+               }\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TDempty(me, 1);\r
+               for(i = 11; i <= 20; ++i) {\r
+                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_primary"), '1 1 0');\r
+               }\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Secondary style:"));\r
+               for(i = 1; i <= 10; ++i) {\r
+                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_secondary"), '1 1 0');\r
+               }\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TDempty(me, 1);\r
+               for(i = 11; i <= 20; ++i) {\r
+                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair_secondary"), '1 1 0');\r
+               }\r
+       me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Size:"));\r
@@ -90,7 +115,9 @@ void fillVoretWeaponsDialog(entity me)
        me.TR(me);\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
+\r
+       me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);\r
+       me.TD(me, 1, 3, makeVoretTextLabel(0, "Crosshair effects:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Hit test:"));\r