From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 24 Jun 2010 15:00:55 +0000 (+0300)
Subject: Call it reticle_type instead, in case the system might be used for other weapons... 
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~12
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4b327b3de76506e7120cb175404b12717979cb2f

Call it reticle_type instead, in case the system might be used for other weapons that aren't based on zoom.
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 555f70f7ad..e363e893e6 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -341,7 +341,7 @@ void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
-float zoom_type;
+float reticle_type;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
@@ -553,11 +553,11 @@ void CSQC_UpdateView(float w, float h)
 	drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
 	// draw the aiming reticle for weapons that use it (eg. Nex)
-	// zoom_type is changed to the item we are zooming with, to decide which reticle to use
+	// reticle_type is changed to the item we are zooming or aiming with, to decide which reticle to use
 	if(button_zoom)
-		zoom_type = 0; // normal zoom
+		reticle_type = 0; // normal zoom
 	else if(activeweapon == WEP_NEX && button_attack2)
-		zoom_type = 1; // nex zoom
+		reticle_type = 1; // nex zoom
 
 	reticle_size_x = max(vid_conwidth, vid_conheight);
 	reticle_size_y = max(vid_conwidth, vid_conheight);
@@ -567,7 +567,7 @@ void CSQC_UpdateView(float w, float h)
 	if(cvar("cl_reticle_nex"))
 	{
 		precache_pic("textures/reticle_nex");
-		if(zoom_type == 1)
+		if(reticle_type == 1)
 			drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
 	}