Better names for the stats

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 43de98187a5cf295a34cd4b3d1cda2c62da2949f..733bab0c1469617277def55115e18855b3c5b7ef 100644 (file)
--- 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 4f60c427b657cbc336cb436eecebe24c0fc79566..36ea68ddd87db7eac868dbcafb68fc3b04e1f328 100644 (file)
--- 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 49944685f5e342847c385cea589cdb5af099f9db..2551d9b28efe449051e18e10edc2549225568071 100644 (file)
--- 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 a9b73c0995a89ef7cc52349f1856765112e2fb24..aaddcbb2888504ae0cde64a1a02228a0292ab133 100644 (file)
--- 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 34535ec0e1d0ab2213a26e5eb5c009db8ba98eeb..d55b7f6fab6497375c7aea6ef219aeabfd22f488 100644 (file)
--- 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 32b611e91586ae00e96aa646887b1ba6592c5364..9f0075afa53756b1f278443e979f7d37bde3c424 100644 (file)
--- 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);