From c7d96bb2c2c44b4beb310880d2f5c02602aa6ce5 Mon Sep 17 00:00:00 2001
From: FruitieX <rasse@rasse-laptop.(none)>
Date: Sun, 3 Oct 2010 19:15:37 +0300
Subject: [PATCH] b0rken nex speed indicator

---
 gfx/nex_ring.tga     | Bin 0 -> 6244 bytes
 qcsrc/client/View.qc |  41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 gfx/nex_ring.tga

diff --git a/gfx/nex_ring.tga b/gfx/nex_ring.tga
new file mode 100644
index 0000000000000000000000000000000000000000..c082c62432f4a82e38146b652d11a8ee1526b79a
GIT binary patch
literal 6244
zcmc(j&ue2<6vxvdLELmTT@(tEMK;9-O8$W^CeR=jsunl1NS9f(e?ejDkIYPGCgV7c
ziZY$)I6i393{qW)3u#=45eY_&SSw<s6%o5gcSC9XeouP7uZ4;8UNd0e+`M<r=bU@)
zefPb0-$^8%O8D=5;(X%iCqL!snNFvZg5)9dkTRqKsX<zhT}T`90K(rPgvZp;MuseX
z=*t+4m9psf*~Jq$9f8b3h!AhzMAM;#fvBN{#EAKPM8`p#=8jCw+c@Y@(}WPt8MEdf
zJ6(b7eSpTmy(3NDn83j_)FsIFhiDAkKGLL(xkqpSDt2A{1Wku$RY=ZkcO964s`eQg
z12~8ov)yrkIn_Qt4&=?Y;=nj;)f)tO9S$H3NB~)a6d+6@0~v)3L6VRJgemcuI@-vP
zr4M}rNCR?U(MfXv<JR*ncF!QC>uBsM?BJg+MMxGhNH@E3oN{VtA+cjV=52A_^RaNS
zt!rp(PV4wzgk*1_u`9_S)YOe(MqE32^MBVfDwm<N09*LyK*rujV*$pFG+V|ngR=R(
z;~7jqRlkbHW@jD$(`#t#Vou{=T{dPnVSaDB^Bh!%SJ0UAD*m${qcLZuzA77UfjRSg
z%hO(#kyDi6qA|w|4g#|=-DTt7^d330mCI<X#|`{Xaxt0XBn~!YtKe+V{BF4OFjTc=
zH0HdI{~{NfITvxTFB{k8u=%~=&MByx0xCEg{Q`|Sb1_w9<IR>bzw7RthHBFQj;Z)1
z8e2?7Ic-9fHvV;YVvn1b&{(<+{AW2}>yfkDkd4kM^SkEG9BWemXE^y48gowKAdrpe
z4x3-uojJ=j18mKHO-DPD6DMfUcxz~^$YJ3dcUX|FV%$~sKzLb(!nY0=q+2%bio<g<
zocqq<bJEQjcbV`2tX$BC7tz=)U*NP^j|J0_;98t8-WsM;m&3yM?yw+T-MD2>rz}J1
z2Zu}2m5saPa9)PsM~4IH^2P~nT>zr1oiqn#%nQ~q8<TArf6;pgyUzXus|_}*9!kbt
zaClsX;?E8jr5iU+a8+GaesQ=WUDddfN6ssE-dLmNz}$In?8_-{yqsz>6o2&|iqh4L
zd(C^8kzwOEhc~2~F-~w8c~bDC;F@u-dgPo8!S5b9kS=GO;BZzlf-{1v#=YW^(=x37
z;gMIROB*M+BtuqkR=Uzjc)Nsnw#L`_BC^ZAF5R}lFMAr@i^Ih;EqGdy^Tr8YQIxGe
zJ@S@xD<|PS8I}YuNw;V4lBW^Q^O)c<rI9mEa9L66e|Z{p>B=YJrVNXM7o}?&Jis&%
zX+%9{#dfEe>ve>bqq7RJ^S9@)V>+U<$I&p|KxiPe`)DN(znY>Jg%*X@jz?_^%?iy5
zZ4+h0lvLag4I0V}`5-?~h!oMhP8<K=)Z81=<%!JeG!W7qidor&qg@gbUiLDPilP*R
z6r`&V2`3^aBqyXsq@~l0kc@OKBD*>r6*4N_E|G8=hlC6XX%l&%)1;83bPtFe>U2QJ
zfOLlukq8|{NH@ZuBTQX{3lQNlMpz6HmQ;j=8F88W-5XA0&zr~5a3UUgONOI;<c%KV
z@e$#nwB&btQ){mG!%lFRZiL5Zln1ol6MIUd_oH8Mtd~lZ*OlIy+e)MNi%@W^S8Q4@
zirz2pSla@@;XL==aKzfm2#&HzinaX`9A|?UYYQnj%H}lIw)a#UYdJ;Py2tt`i1oQ)
zFyG;EK4@ZnGR68Bi}jh;-R&UvI3JRIeY*Db(R`}U^u7uMeU&8oDu$e@{L)v!r>{~|
zUq!CRQf7Osg}?u~h<S%Q2tHHtkcSmn?>aC;fR#0?MzGq`Ez{m}AP3dM3cUdV-u7t-
z-^{&A#%m5Tm;Wk4TgjRc*(J-E&D&_~(ZbRdHQloIeMUS@;oQpZXAma^VLI~=#;rg&
zb{1WCA#Df?`TVhp#AE7cBSV%x^kodj>K65x8h<a$ym)qY>iMbZ=bm{fH}&k<@x;IC
CJ6B);

literal 0
HcmV?d00001

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 0b7dcac79..04f300703 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -697,6 +697,47 @@ void CSQC_UpdateView(float w, float h)
 			if(cvar("viewsize") < 120)
 				CSQC_common_hud();
 
+
+		// ring around crosshair representing velocity-dependent damage for the nex
+		if (activeweapon == WEP_NEX)
+		{
+			float x, y;
+			vector ringorigin, ringsize, t;
+			ringorigin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
+			ringsize = 64 * '1 1 0'; // testing only
+
+			// TODO send from server
+			float maxvel, minvel, curvel;
+			minvel = 400;
+			maxvel = 1000;
+			curvel = vlen(pmove_vel);
+
+			f = bound(0, (curvel - minvel) / (maxvel - minvel), 1);
+			x = cos(f * M_2_PI);
+			y = sin(f * M_2_PI);
+			f = fabs(x) + fabs(y);
+			x /= f;
+			y /= f;
+			print("x:", ftos(x), " y:", ftos(y), "\n");
+			if(x >= 0 && y >= 0) // first quadrant
+			{
+				R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
+
+				v = ringorigin;			t = '0.5 0.5 0';
+				R_PolygonVertex(v, t, '1 1 1', 1);
+
+				v = ringorigin;			t = '0.5 0.5 0';
+				v_x += 0.5 * ringsize_x;	t += '0.5 0.5 0';
+				R_PolygonVertex(v, t, '1 1 1', 1);
+
+				v = ringorigin;			t = '0.5 0.5 0';
+				v_x += x * 0.5 * ringsize_x;	t += x * '0.5 0.5 0';
+				v_y += y * 0.5 * ringsize_y;	t += y * '0.5 -0.5 0';
+				R_PolygonVertex(v, t, '1 1 1', 1);
+				R_EndPolygon();
+			}
+		}
+
 		// crosshair goes VERY LAST
 		if(!scoreboard_active && !camera_active && intermission != 2) {
 			// TrueAim check
-- 
2.39.2