From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 27 Dec 2011 20:56:58 +0000 (+0100)
Subject: more crosshair bugfixes; show the 6 new ones
X-Git-Tag: xonotic-v0.6.0~74^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07ff2faacd0ebc3bc5a5ac1e8f644ed236079306;p=xonotic%2Fxonotic-data.pk3dir.git

more crosshair bugfixes; show the 6 new ones
---

diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c
index c3921c3a4..9456cd66d 100644
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -110,7 +110,11 @@ void XonoticCrosshairButton_draw(entity me)
 		*/
 	}
 	else // show the crosshair picker at full size
-		sz = '0.95 0.95 0';
+	{
+		sz = sz * (0.95 / sz_x);
+		if(sz_y > 0.95)
+			sz = sz * (0.95 / sz_y);
+	}
 
 	draw_Picture('0.5 0.5 0' - 0.5 * sz, me.src3, sz, rgb, a);
 	if(cvar("crosshair_dot"))
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index e8096b1b9..d4211de0b 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -113,8 +113,8 @@ void XonoticPlayerSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "crosshair_per_weapon", _("Per weapon")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		for(i = 1; i <= 10; ++i) {
-			me.TDNoMargin(me, 1, 2 / 10, e = makeXonoticCrosshairButton(3, i), '1 1 0');
+		for(i = 1; i <= 13; ++i) {
+			me.TDNoMargin(me, 1, 2 / 13, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 		// show a larger preview of the selected crosshair
@@ -123,8 +123,8 @@ void XonoticPlayerSettingsTab_fill(entity me)
 		setDependent(e, "crosshair_per_weapon", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		for(i = 11; i <= 20; ++i) {
-			me.TDNoMargin(me, 1, 2 / 10, e = makeXonoticCrosshairButton(3, i), '1 1 0');
+		for(i = 14; i <= 26; ++i) {
+			me.TDNoMargin(me, 1, 2 / 13, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);