fix some buttons that apparently share the same id

diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c
index 1345517264d73bbfd19e265d663942d133b326cd..26b9bcb8f52361d9a60b9ea794ec3de95a7be8a3 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -84,6 +84,7 @@ void XonoticCrosshairButton_draw(entity me)
                        strunzone(me.src3);
                me.src3 = strzone(strcat("/gfx/crosshair", cvar_string("crosshair")));
                me.focused = 1;
+               me.checked = 0;
        }
 
        SUPER(XonoticCrosshairButton).draw(me);

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 4cde74ed2b29d714093a71e7da452dd2dd70be04..02177fb6363dded55bc059e8b4510a7b1f2f95e7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -119,7 +119,8 @@ 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(3, -1), '1 1 0'); // crosshair -1 makes this a preview
+               me.TDNoMargin(me, 2, 2 / 5, e = makeXonoticCrosshairButton(4, -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);
                for(i = 11; i <= 20; ++i) {
@@ -154,9 +155,9 @@ void XonoticPlayerSettingsTab_fill(entity me)
                        setDependent(e, "crosshair_dot", 1, 1);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Hit test:"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "0",    "None"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "1",    "TrueAim"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "crosshair_hittest", "1.25", "Enemies"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "0",    "None"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1",    "TrueAim"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1.25", "Enemies"));
        me.TR(me);
        me.TR(me);
                me.TDempty(me, 0.4);
@@ -173,9 +174,9 @@ void XonoticPlayerSettingsTab_fill(entity me)
        me.TR(me);
        #ifdef ALLOW_FORCEMODELS
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Force models:"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, string_null, string_null, "None"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodelsfromxonotic", string_null, "Custom"));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodels", string_null, "All"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, "None"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodelsfromxonotic", string_null, "Custom"));
+               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodels", string_null, "All"));
        #endif
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", "Disable gore effects"));
        me.TR(me);