Perhaps it would be best not to name these floats the same way. Who knows what confli...

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 93f1d7bd4941859a8c59567835b865440fe80288..a9b73c0995a89ef7cc52349f1856765112e2fb24 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_pickup_crosshair;
+.float stat_crosshair_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 0a69fd50e3849c90e26f2d58d554659066b22d5e..34535ec0e1d0ab2213a26e5eb5c009db8ba98eeb 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_pickup_crosshair);
+       addstat(STAT_PICKUP_CROSSHAIR, AS_FLOAT, stat_crosshair_pickup);
 
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
 

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b8c6404c9a7dbd80021a740f1ba8c2ed4deaa4ac..32b611e91586ae00e96aa646887b1ba6592c5364 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_pickup_crosshair = time;
+       other.stat_crosshair_pickup = time;
 
        pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);