fit all items into the playersetup page, tweak the crosshair size constants

diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c
index a6608a7d7d090053f2605dfcc1cc3fc3482b8fe7..058bfd7eb16638eb4722631ce48d2f022685050d 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -78,7 +78,7 @@ void XonoticCrosshairButton_draw(entity me)
 
        sz = draw_PictureSize(me.src3);
        sz = globalToBoxSize(sz, draw_scale);
 
        sz = draw_PictureSize(me.src3);
        sz = globalToBoxSize(sz, draw_scale);

-       sz = (2 * '1 1 0' + sz * cvar("crosshair_size")) * 0.1; // (2 * '1 1 0' + ...) * 0.1 here to make visible size changes happen also at bigger sizes
+       sz = (10 * '1 1 0' + sz * cvar("crosshair_size")) * 0.05; // (10 * '1 1 0' + ...) * 0.05 here to make visible size changes happen also at bigger sizes

        if(sz_x > 0.95)
                sz = sz * (0.95 / sz_x);
        if(sz_y > 0.95)
        if(sz_x > 0.95)
                sz = sz * (0.95 / sz_x);
        if(sz_y > 0.95)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 16ca36ff0e32e0224db2d7487ca281763b2beee1..751c5559180c592e5ac2b350dea2ad1b00afb0d6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -107,7 +107,6 @@ void XonoticPlayerSettingsTab_fill(entity me)
                me.TD(me, 1, 1.5, e0 = makeXonoticTextLabel(0, string_null));
                        e0.textEntity = main.weaponsDialog;
                        e0.allowCut = 1;
                me.TD(me, 1, 1.5, e0 = makeXonoticTextLabel(0, string_null));
                        e0.textEntity = main.weaponsDialog;
                        e0.allowCut = 1;

-       me.TR(me);

        me.TR(me);
                me.TD(me, 1, 0.75, e = makeXonoticTextLabel(0, "Crosshair:"));
                me.TD(me, 1, 1.00, e = makeXonoticCheckBox(0, "crosshair_per_weapon", "Per weapon"));
        me.TR(me);
                me.TD(me, 1, 0.75, e = makeXonoticTextLabel(0, "Crosshair:"));
                me.TD(me, 1, 1.00, e = makeXonoticCheckBox(0, "crosshair_per_weapon", "Per weapon"));