From 4ca4536951fa31ac9305f313e908c7c954774ee3 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 24 Nov 2013 13:47:27 -0500 Subject: [PATCH] Check for joy_detected when displaying "Use joystick input" checkbox --- qcsrc/menu/xonotic/dialog_settings_input.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 58ab3f555..78bd1e4e8 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -49,9 +49,15 @@ void XonoticInputSettingsTab_fill(entity me) me.TR(me); me.TR(me); if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE) + { me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input"))); + setDependent(e, "joy_detected", 1, 10000000); + } else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE) + { me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input"))); + setDependent(e, "joy_detected", 1, 10000000); + } else { me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input"))); -- 2.39.2