Make the sliders in view settings into checkboxes (looks cleaner, and there's no...

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index cf9d12874e44b0173f37bb3a5a744bf903fd42f8..4f7bd1168639f546f55f53107505ee345683bec0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -18,7 +18,7 @@ void HUDSetup_Check_Gamestatus(entity me, entity btn)
 {
        if not(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)) // we're not in a match, ask the player if they want to start one anyway
        {
-               DialogOpenButton_Click(btn, main.hudconfirmDialog);
+               DialogOpenButton_Click(me, main.hudconfirmDialog);
        }
        else // already in a match, lets just cut to the point and open up the hud editor directly
        {

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index a8e31c52cac14953afb2e35d45c8c79aca2ea15e..98d7f10a562e15520b298ffd22ab00868ce1d74c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -86,19 +86,13 @@ void XonoticViewDialog_fill(entity me)
                setDependent(e, "chase_active", -1, 0);
        me.TR(me);
                me.TDempty(me, 0.2);
-               sl = makeXonoticSlider(0.45, 0.75, 0.01, "cl_bobcycle");
-               makeMulti(sl, "cl_bob2cycle");
-               setDependent(sl, "chase_active", -1, 0);
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View bobbing:")));
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(2, 0, "v_idlescale", _("View waving while idle")));
                setDependent(e, "chase_active", -1, 0);
-               me.TD(me, 1, 1.8, sl);
        me.TR(me);
                me.TDempty(me, 0.2);
-               sl = makeXonoticSlider(1, 10, 1, "v_idlescale");
-               setDependent(sl, "chase_active", -1, 0);
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View waving:")));
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.65, 0, "cl_bobcycle", _("View bobbing while walking around")));
+               makeMulti(sl, "cl_bob2cycle");
                setDependent(e, "chase_active", -1, 0);
-               me.TD(me, 1, 1.8, sl);
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective")));