From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 19 Jun 2010 23:03:41 +0000 (+0300)
Subject: Fix conflict with Panel HUD: Add the code back in proper position.
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9067a763045e220ff9aa7cff56845983f910efd1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix conflict with Panel HUD: Add the code back in proper position.
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index e1578b115..2667c29a9 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -551,6 +551,16 @@ void CSQC_UpdateView(float w, float h)
 	// next R_RenderScene call
 	drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
+	// draw the aiming reticle for weapons that use it (eg. Nex)
+	reticle_pos_x = 0;
+	reticle_pos_y = 0;
+	reticle_size_x = vid_conwidth;
+	reticle_size_y = vid_conheight;
+
+	if(cvar("cl_reticle_nex"))
+	if(button_attack2 && activeweapon == WEP_NEX)
+		drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
+
 	// Draw the mouse cursor
 	// NOTE: drawpic must happen after R_RenderScene for some reason
 	//drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);