From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 24 Jun 2010 16:01:22 +0000 (+0300)
Subject: Add normal zoom reticle (when zooming with the zoom button). Still working on the... 
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b46647de44049e8d5d157ae2165418eefd48d109;p=xonotic%2Fxonotic-data.pk3dir.git

Add normal zoom reticle (when zooming with the zoom button). Still working on the texture.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 5a66cb4ba..9d5c902e3 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -207,6 +207,7 @@ seta crosshair_fireball_color_blue 0.2	"crosshair color blue component to displa
 seta crosshair_fireball_color_alpha 1	"crosshair alpha value to display when wielding the fireball"
 seta crosshair_fireball_size 1	"crosshair size when wielding the fireball"
 seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
 fov 90
 seta cl_velocityzoom 0	"velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3	"time value for averaging speed values"
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 8d283b106..c65da4c5c 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -566,6 +566,12 @@ void CSQC_UpdateView(float w, float h)
 	reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
 	reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
 
+	if(cvar("cl_reticle_normal"))
+	{
+		precache_pic("textures/reticle_normal");
+		if(reticle_type == 0 && current_zoomfraction)
+			drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_normal"), DRAWFLAG_NORMAL);
+	}
 	if(cvar("cl_reticle_nex"))
 	{
 		precache_pic("textures/reticle_nex");
diff --git a/textures/reticle_normal.tga b/textures/reticle_normal.tga
new file mode 100644
index 000000000..b4b7f1337
Binary files /dev/null and b/textures/reticle_normal.tga differ