From a6c82b0562a6340f0723754a8a1e2aa66621e744 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 19 Jul 2011 14:21:14 +0300 Subject: [PATCH] Make a menu change which will be needed for multiple crosshairs later on --- data/qcsrc/menu/voret/crosshairbutton.c | 12 ++++++------ .../voret/dialog_multiplayer_playersetup_weapons.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/menu/voret/crosshairbutton.c b/data/qcsrc/menu/voret/crosshairbutton.c index dd3f91eb..228b2652 100644 --- a/data/qcsrc/menu/voret/crosshairbutton.c +++ b/data/qcsrc/menu/voret/crosshairbutton.c @@ -1,6 +1,6 @@ #ifdef INTERFACE CLASS(VoretCrosshairButton) EXTENDS(RadioButton) - METHOD(VoretCrosshairButton, configureVoretCrosshairButton, void(entity, float, float)) + METHOD(VoretCrosshairButton, configureVoretCrosshairButton, void(entity, float, float, string)) METHOD(VoretCrosshairButton, setChecked, void(entity, float)) METHOD(VoretCrosshairButton, draw, void(entity)) ATTRIB(VoretCrosshairButton, fontSize, float, SKINFONTSIZE_NORMAL) @@ -14,20 +14,20 @@ CLASS(VoretCrosshairButton) EXTENDS(RadioButton) METHOD(VoretCrosshairButton, loadCvars, void(entity)) METHOD(VoretCrosshairButton, saveCvars, void(entity)) ENDCLASS(VoretCrosshairButton) -entity makeVoretCrosshairButton(float, float); +entity makeVoretCrosshairButton(float, float, string); #endif #ifdef IMPLEMENTATION -entity makeVoretCrosshairButton(float theGroup, float theCrosshair) +entity makeVoretCrosshairButton(float theGroup, float theCrosshair, string theCvar) { entity me; me = spawnVoretCrosshairButton(); - me.configureVoretCrosshairButton(me, theGroup, theCrosshair); + me.configureVoretCrosshairButton(me, theGroup, theCrosshair, theCvar); return me; } -void configureVoretCrosshairButtonVoretCrosshairButton(entity me, float theGroup, float theCrosshair) +void configureVoretCrosshairButtonVoretCrosshairButton(entity me, float theGroup, float theCrosshair, string theCvar) { - me.cvarName = "crosshair"; + me.cvarName = theCvar; me.cvarValueFloat = theCrosshair; me.loadCvars(me); me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0); diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c index c2508621..089e3ef0 100644 --- 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); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Crosshair:")); for(i = 1; i <= 10; ++i) { - me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i), '1 1 0'); + me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0'); } me.TR(me); me.TDempty(me, 0.3); me.TDempty(me, 1); for(i = 11; i <= 20; ++i) { - me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i), '1 1 0'); + me.TDNoMargin(me, 1, 2.5 / 10, e = makeVoretCrosshairButton(3, i, "crosshair"), '1 1 0'); } me.TR(me); me.TDempty(me, 0.3); -- 2.39.2