From 508de8ad1dca45f8e4c135abf0cdb167669ef640 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 6 Jan 2012 15:57:22 +0100
Subject: [PATCH] 2 more crosshairs for asyyy

---
 gfx/crosshair27.tga                              | Bin 0 -> 1164 bytes
 gfx/crosshair28.tga                              | Bin 0 -> 2792 bytes
 .../xonotic/dialog_multiplayer_playersetup.c     |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 gfx/crosshair27.tga
 create mode 100644 gfx/crosshair28.tga

diff --git a/gfx/crosshair27.tga b/gfx/crosshair27.tga
new file mode 100644
index 0000000000000000000000000000000000000000..7d4f980ada0be7e95bf1890e4bf1a5d690c63a26
GIT binary patch
literal 1164
zcmeHHOA5k342`bDON<xLGjvm-APWBQI-=qsbU#ZM#dU9!b#D+~0y9HP)gGXQJd$|{
zO!G1!no{^O%4jyJM1)%K)Uy%5!TcG(8hMyA?g1|*)E7je2{p_aXFv%34It(<362CO
z;;zX<C}chO+KsEWbPRAXRfS&w(G!N5PL`v}B%Mk`NhjkBOr5uq<~0e91otF-tnjHK
zOjF%)iQd2SyDI}L)EXJpv-6>u(D4QO^yH#WDqR{DOZdAMDwMQ$N!T{~?IAxFyJEAR
KpO(ccU(g5Iplpo*

literal 0
HcmV?d00001

diff --git a/gfx/crosshair28.tga b/gfx/crosshair28.tga
new file mode 100644
index 0000000000000000000000000000000000000000..16dcc8be2666461c290ca28b1204a0ab7a71bef6
GIT binary patch
literal 2792
zcmbtWNovDD5S)N9A@~J8<=|`b244~|1O=3Z{6jAY+4sd+2qA<V@(7*$4gW${%Lgl6
zh1J7gX%tz4X-QL6Ju^K$i!o~^fBL3x)>lVamYGs>4Rl3JS4!(Q|7)R!*afQEVmeZW
zQW7b6CQ@Q4y&o}T^yW1{@PG+Lhd$2bi!H&?_*6`Wc0rE5#Sn{7qu5yfI@Hk^`5oem
z!kN6oFEJE`@-ZW(ETf_X9iV6`@8DAmMS*-wi9wW*e+Cf0-77H^rSc9w#Hc7GMi%)r
z7!Be!afR=T!hGB<>a?3N0&ZJ;b%eywVoW{_{2=HPSBRL~t}2E|_o(B1K#XwDl)!O5
z6^jw=h`P(1fRImJ@k5RwvZ-Q-dPp5YQ_wZGeCNTagTFHIjR&L7NAUHEx?7KT4W>J0
z4v9M7xHNGJ#MIq;T0Ze$)RjyJyLRjmQ}?(?K>DQ+2K>_br9<)yvIl&d3Z#<t?D$8r
z+terKrZN63f!K@G*nEIfOCaX1AdJcqh`mXT^?-m|0x@^-A{Q)ySS6vdiONn^4zn^)
zm7%UNZA+y^qeN`91R5>AM$5j@hSO-P^KECocu?19d)K`%l7&+DU}<!uQOx7f-Id(c
zMa&+ey8AA3Y*P$hbuJ3p%{o^S71h4{;EZ49y2W{H&&AkY5-E6ahlr*8_tK|%Tz0)2
diL>(CX?~O44-d8u2YZ9vVB=_eu(P#k{s7zqi4*_;

literal 0
HcmV?d00001

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index fde65aa5e..636508165 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -115,8 +115,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 <= 13; ++i) {
-			me.TDNoMargin(me, 1, 2 / 13, e = makeXonoticCrosshairButton(3, i), '1 1 0');
+		for(i = 1; i <= 14; ++i) {
+			me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 		// show a larger preview of the selected crosshair
@@ -125,8 +125,8 @@ void XonoticPlayerSettingsTab_fill(entity me)
 		setDependent(e, "crosshair_per_weapon", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		for(i = 14; i <= 26; ++i) {
-			me.TDNoMargin(me, 1, 2 / 13, e = makeXonoticCrosshairButton(3, i), '1 1 0');
+		for(i = 15; i <= 28; ++i) {
+			me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(3, i), '1 1 0');
 			setDependent(e, "crosshair_per_weapon", 0, 0);
 		}
 	me.TR(me);
-- 
2.39.2