Make a menu change which will be needed for multiple crosshairs later on

diff --git a/data/qcsrc/menu/voret/crosshairbutton.c b/data/qcsrc/menu/voret/crosshairbutton.c
index dd3f91ebbfdd80d52b00e3b16175a1d25d24c79c..228b265287e565b69a4dc160e114b97cd232cd76 100644 (file)
--- a/data/qcsrc/menu/voret/crosshairbutton.c
+++ b/data/qcsrc/menu/voret/crosshairbutton.c
@@ -1,6 +1,6 @@
 #ifdef INTERFACE\r
 CLASS(VoretCrosshairButton) EXTENDS(RadioButton)\r
-       METHOD(VoretCrosshairButton, configureVoretCrosshairButton, void(entity, float, float))\r
+       METHOD(VoretCrosshairButton, configureVoretCrosshairButton, void(entity, float, float, string))\r
        METHOD(VoretCrosshairButton, setChecked, void(entity, float))\r
        METHOD(VoretCrosshairButton, draw, void(entity))\r
        ATTRIB(VoretCrosshairButton, fontSize, float, SKINFONTSIZE_NORMAL)\r
@@ -14,20 +14,20 @@ CLASS(VoretCrosshairButton) EXTENDS(RadioButton)
        METHOD(VoretCrosshairButton, loadCvars, void(entity))\r
        METHOD(VoretCrosshairButton, saveCvars, void(entity))\r
 ENDCLASS(VoretCrosshairButton)\r
-entity makeVoretCrosshairButton(float, float);\r
+entity makeVoretCrosshairButton(float, float, string);\r
 #endif\r
 \r
 #ifdef IMPLEMENTATION\r
-entity makeVoretCrosshairButton(float theGroup, float theCrosshair)\r
+entity makeVoretCrosshairButton(float theGroup, float theCrosshair, string theCvar)\r
 {\r
        entity me;\r
        me = spawnVoretCrosshairButton();\r
-       me.configureVoretCrosshairButton(me, theGroup, theCrosshair);\r
+       me.configureVoretCrosshairButton(me, theGroup, theCrosshair, theCvar);\r
        return me;\r
 }\r
-void configureVoretCrosshairButtonVoretCrosshairButton(entity me, float theGroup, float theCrosshair)\r
+void configureVoretCrosshairButtonVoretCrosshairButton(entity me, float theGroup, float theCrosshair, string theCvar)\r
 {\r
-       me.cvarName = "crosshair";\r
+       me.cvarName = theCvar;\r
        me.cvarValueFloat = theCrosshair;\r
        me.loadCvars(me);\r
        me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0);\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index c25086211e27d2db0a53a675cad6bfeb7e44c878..089e3ef088e04daf1ff494ad9e09640c56499f36 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -53,13 +53,13 @@ void fillVoretWeaponsDialog(entity me)
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Crosshair:"));\r
                for(i = 1; i <= 10; ++i) {\r
-                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i), '1 1 0');\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.TDempty(me, 1);\r
                for(i = 11; i <= 20; ++i) {\r
-                       me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i), '1 1 0');\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