From c490e6c99eab86ac552d27bb9b13c952846ec989 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 25 Nov 2011 16:23:02 +0100 Subject: [PATCH] fix two bugs of crosshair button. Did anyone EVER test this one? --- qcsrc/menu/xonotic/crosshairbutton.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c index 434a7bc87..caaa12322 100644 --- a/qcsrc/menu/xonotic/crosshairbutton.c +++ b/qcsrc/menu/xonotic/crosshairbutton.c @@ -34,7 +34,7 @@ void XonoticCrosshairButton_configureXonoticCrosshairButton(entity me, float the me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0); me.srcMulti = 1; if(me.cvarValueFloat == -1) - me.src3 = strzone(strcat("/gfx/crosshair", cvar("crosshair"))); + me.src3 = strzone(strcat("/gfx/crosshair", cvar_string("crosshair"))); else me.src3 = strzone(strcat("/gfx/crosshair", ftos(me.cvarValueFloat))); me.src4 = "/gfx/crosshairdot"; diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index caa986d43..6748ef875 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -117,7 +117,7 @@ void XonoticPlayerSettingsTab_fill(entity me) } // show a larger preview of the selected crosshair me.TDempty(me, 0.2); - me.TDNoMargin(me, 2, 2 / 5, e = makeXonoticCrosshairButton(4, -1), '1 1 0'); // crosshair -1 makes this a preview + me.TDNoMargin(me, 2, 2 / 5, e = makeXonoticCrosshairButton(7, -1), '1 1 0'); // crosshair -1 makes this a preview setDependent(e, "crosshair_per_weapon", 0, 0); me.TR(me); me.TDempty(me, 0.2); -- 2.39.2