From: Samual Date: Tue, 17 Jan 2012 04:55:10 +0000 (-0500) Subject: Move some things around in the settings window X-Git-Tag: xonotic-v0.6.0~144 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=715915867300047b6a64c7c453c66f2fbb151ac3;p=xonotic%2Fxonotic-data.pk3dir.git Move some things around in the settings window --- diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 1b39ad959..6e15da11b 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -46,6 +46,17 @@ void XonoticInputSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump"))); 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"))); + else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE) + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input"))); + else + { + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "", _("Use joystick input"))); + e.disabled = 1; // the option is never available in this case, just there for show + } + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Mouse:"))); me.TR(me); @@ -72,23 +83,6 @@ void XonoticInputSettingsTab_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration"))); - 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"))); - else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE) - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input"))); - else - { - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "", _("Use joystick input"))); - e.disabled = 1; // the option is never available in this case, just there for show - } - me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction"))); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Compensate for prediction errors"))); - setDependent(e, "cl_movement", 1, 1); me.gotoRC(me, me.rows - 1, 0); diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index ec1b93bd2..6bc0c350a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -68,5 +68,11 @@ void XonoticMiscSettingsTab_fill(entity me) me.TD(me, 1, 2, e = makeXonoticButton(_("Advanced settings..."), '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.cvarsDialog; + me.TR(me); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction"))); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Compensate for prediction errors"))); + setDependent(e, "cl_movement", 1, 1); } #endif