From: Samual <samual@xonotic.org>
Date: Sat, 20 Aug 2011 08:13:35 +0000 (-0400)
Subject: Apply same logic to crosshair_pickup animation as well
X-Git-Tag: xonotic-v0.5.0~110^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a287a4a58acdedc1ffe0a0bd4df6c65af4d7be1;p=xonotic%2Fxonotic-data.pk3dir.git

Apply same logic to crosshair_pickup animation as well
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 64e068fc0..f01504744 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -348,7 +348,7 @@ void CSQC_RAPTOR_HUD();
 vector freeze_org, freeze_ang;
 entity nightvision_noise, nightvision_noise2;
 
-#define HITINDICATION_MAXTIMEDIFF 5
+#define MAX_TIME_DIFF 5
 float pickup_crosshair_time, pickup_crosshair_size;
 float hit_time, typehit_time;
 float nextsound_hit_time, nextsound_typehit_time;
@@ -958,7 +958,7 @@ void CSQC_UpdateView(float w, float h)
 	hit_time = getstatf(STAT_HIT_TIME);
 	if(hit_time > nextsound_hit_time && autocvar_cl_hitsound)
 	{
-		if(time - hit_time < HITINDICATION_MAXTIMEDIFF) // don't play the sound if it's too old.
+		if(time - hit_time < MAX_TIME_DIFF) // don't play the sound if it's too old.
 			sound(world, CH_INFO, "misc/hit.wav", VOL_BASE, ATTN_NONE);
 			
 		nextsound_hit_time = time + autocvar_cl_hitsound_antispam_time;
@@ -966,7 +966,7 @@ void CSQC_UpdateView(float w, float h)
 	typehit_time = getstatf(STAT_TYPEHIT_TIME);
 	if(typehit_time > nextsound_typehit_time) 
 	{
-		if(time - typehit_time < HITINDICATION_MAXTIMEDIFF) // don't play the sound if it's too old.
+		if(time - typehit_time < MAX_TIME_DIFF) // don't play the sound if it's too old.
 			sound(world, CH_INFO, "misc/typehit.wav", VOL_BASE, ATTN_NONE);
 			
 		nextsound_typehit_time = time + autocvar_cl_hitsound_antispam_time;
@@ -1115,10 +1115,14 @@ void CSQC_UpdateView(float w, float h)
 
 			if(autocvar_crosshair_pickup)
 			{
-				if(pickup_crosshair_time < getstatf(STAT_LAST_PICKUP))
+				float stat_pickup_time = getstatf(STAT_LAST_PICKUP);
+				
+				if(pickup_crosshair_time < stat_pickup_time)
 				{
-					pickup_crosshair_size = 1;
-					pickup_crosshair_time = getstatf(STAT_LAST_PICKUP);
+					if(time - stat_pickup_time < MAX_TIME_DIFF)
+						pickup_crosshair_size = 1;
+						
+					pickup_crosshair_time = stat_pickup_time;
 				}
 
 				if(pickup_crosshair_size > 0)
@@ -1129,13 +1133,12 @@ void CSQC_UpdateView(float w, float h)
 				wcross_scale += sin(pickup_crosshair_size) * autocvar_crosshair_pickup;
 			}
 
-			vector hitindication_color;
 			if(autocvar_crosshair_hitindication)
 			{
-				hitindication_color = stov(autocvar_crosshair_hitindication_color);
+				vector hitindication_color = stov(autocvar_crosshair_hitindication_color);
 				if(hitindication_crosshair_time < hit_time)
 				{
-					if(time - hit_time < HITINDICATION_MAXTIMEDIFF) // don't trigger the animation if it's too old
+					if(time - hit_time < MAX_TIME_DIFF) // don't trigger the animation if it's too old
 						hitindication_crosshair_size = 1;
 						
 					hitindication_crosshair_time = hit_time;