From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 12 Oct 2010 15:59:27 +0000 (+0300)
Subject: fit all items into the playersetup page, tweak the crosshair size constants
X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2~5^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b399823c67e5b20b0460df35b38b4341c431ee2;p=xonotic%2Fxonotic-data.pk3dir.git

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 a6608a7d7..058bfd7eb 100644
--- 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 = (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)
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 16ca36ff0..751c55591 100644
--- 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.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"));