From: Mircea Kitsune Date: Sat, 30 Oct 2010 15:01:26 +0000 (+0300) Subject: Perhaps it would be best not to name these floats the same way. Who knows what confli... X-Git-Tag: xonotic-v0.1.0preview~224^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6816903aae4f5cc77ab39b603e845cbf3acbbc12;p=xonotic%2Fxonotic-data.pk3dir.git Perhaps it would be best not to name these floats the same way. Who knows what conflicts that can cause --- diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 93f1d7bd4..a9b73c099 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_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 0a69fd50e..34535ec0e 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_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 b8c6404c9..32b611e91 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_pickup_crosshair = time; + other.stat_crosshair_pickup = time; pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);