From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 19 Jun 2010 22:59:22 +0000 (+0300)
Subject: Fix conflict with Panel HUD: Remove code from view.qc
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~22
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=156a91fc7113a35a406b6567937f54d378a2a430

Fix conflict with Panel HUD: Remove code from view.qc
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 86e96d2f54..1baaf36836 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -579,16 +579,6 @@ void CSQC_UpdateView(float w, float h)
 			self.draw2d();
 	self = e;
 
-	// 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 radar
 	if(
 			ons_showmap