From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Apr 2011 12:23:48 +0000 (+0300)
Subject: Crosshair ring to indicate how many rockets are loaded into the hagar
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed21c873117b71545a269bf9f446f2742e24e6a0;p=xonotic%2Fxonotic-data.pk3dir.git

Crosshair ring to indicate how many rockets are loaded into the hagar
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index cd7245068..6aa741ebd 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -205,6 +205,9 @@ seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05
 seta crosshair_ring_minelayer 1
 seta crosshair_ring_minelayer_alpha 0.15
 
+seta crosshair_ring_hagar 1
+seta crosshair_ring_hagar_alpha 0.15
+
 seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings"
 seta crosshair_ring_reload_size 2.5	"reload ring size"
 seta crosshair_ring_reload_alpha 0.2	"reload ring alpha"
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 09ec96eab..059fd0f4e 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1123,6 +1123,13 @@ void CSQC_UpdateView(float w, float h)
 					ring_rgb = wcross_color;
 					ring_image = "gfx/crosshair_ring.tga";
 				}
+				else if (activeweapon == WEP_HAGAR && getstati(STAT_HAGAR_LOAD) && autocvar_crosshair_ring_hagar)
+				{
+					ring_value = bound(0, getstati(STAT_HAGAR_LOAD) / getstati(STAT_HAGAR_MAXLOAD), 1);
+					ring_alpha = autocvar_crosshair_ring_hagar_alpha;
+					ring_rgb = wcross_color;
+					ring_image = "gfx/crosshair_ring.tga";
+				}
 
 				if(autocvar_crosshair_ring_reload && weapon_clipsize) // forces there to be only an ammo ring 
 				{
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index e11266ce0..41e34cfea 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -112,6 +112,8 @@ float autocvar_crosshair_ring;
 float autocvar_crosshair_ring_inner;
 float autocvar_crosshair_ring_minelayer;
 float autocvar_crosshair_ring_minelayer_alpha;
+float autocvar_crosshair_ring_hagar;
+float autocvar_crosshair_ring_hagar_alpha;
 float autocvar_crosshair_ring_nex;
 float autocvar_crosshair_ring_nex_alpha;
 float autocvar_crosshair_ring_nex_currentcharge_movingavg_rate;