From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 30 Oct 2010 15:31:22 +0000 (+0300)
Subject: Better names for the stats
X-Git-Tag: xonotic-v0.1.0preview~224^2~1
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=4e43b7fd3576dcce513b2ac941cb406946a534be;p=xonotic%2Fxonotic-data.pk3dir.git

Better names for the stats
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 43de98187..733bab0c1 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -773,10 +773,10 @@ void CSQC_UpdateView(float w, float h)
 
 				if(cvar("crosshair_pickup"))
 				{
-					if(pickup_crosshair_time < getstatf(STAT_PICKUP_CROSSHAIR))
+					if(pickup_crosshair_time < getstatf(STAT_LAST_PICKUP))
 					{
 						pickup_crosshair_size = 1;
-						pickup_crosshair_time = getstatf(STAT_PICKUP_CROSSHAIR);
+						pickup_crosshair_time = getstatf(STAT_LAST_PICKUP);
 					}
 
 					if(pickup_crosshair_size > 0)
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 4f60c427b..36ea68ddd 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -310,7 +310,7 @@ const float STAT_SHOTORG = 46; // compressShotOrigin
 const float STAT_LEADLIMIT = 47;
 const float STAT_BULLETS_LOADED = 48;
 const float STAT_NEX_CHARGE = 49;
-const float	STAT_PICKUP_CROSSHAIR = 50;
+const float	STAT_LAST_PICKUP = 50;
 const float STAT_HUD = 51;
 
 // see DP source, quakedef.h
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 49944685f..2551d9b28 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2241,7 +2241,7 @@ void SpectateCopy(entity spectatee) {
 	self.dmg_inflictor = spectatee.dmg_inflictor;
 	self.angles = spectatee.v_angle;
 	self.fixangle = TRUE;
-	self.stat_crosshair_pickup = spectatee.stat_crosshair_pickup;
+	self.last_pickup = spectatee.last_pickup;
 	setorigin(self, spectatee.origin);
 	setsize(self, spectatee.mins, spectatee.maxs);
 	SetZoomState(spectatee.zoomstate);
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index a9b73c099..aaddcbb28 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -603,7 +603,7 @@ string matchid;
 .float stats_hit[WEP_MAXCOUNT];  // for hitscan bullets hit
 .float stats_fired[WEP_MAXCOUNT];  // for hitscan bullets fired
 
-.float stat_crosshair_pickup;
+.float last_pickup;
 
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 34535ec0e..d55b7f6fa 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -641,7 +641,7 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
 	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
-	addstat(STAT_PICKUP_CROSSHAIR, AS_FLOAT, stat_crosshair_pickup);
+	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
 
 	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
 
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 32b611e91..9f0075afa 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -489,7 +489,7 @@ void Item_Touch (void)
 	if(!Item_GiveTo(self, other))
 		return;
 
-	other.stat_crosshair_pickup = time;
+	other.last_pickup = time;
 
 	pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);