From: Mircea Kitsune Date: Sat, 30 Oct 2010 14:26:27 +0000 (+0300) Subject: other, not self.owner. Code is now functional and working as intended X-Git-Tag: xonotic-v0.1.0preview~224^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=357a423be2b461bdeaf7c8815546e781088e04fb;p=xonotic%2Fxonotic-data.pk3dir.git other, not self.owner. Code is now functional and working as intended --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 60be1ebef..df2f52e4c 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -770,8 +770,7 @@ void CSQC_UpdateView(float w, float h) { wcross_scale = 1; } -if(!pickup_crosshair_fade) -pickup_crosshair_fade = 1; + if(pickup_crosshair_time < getstatf(STAT_PICKUP_CROSSHAIR)) { pickup_crosshair_fade = 1; @@ -782,7 +781,6 @@ pickup_crosshair_fade = 1; else pickup_crosshair_fade = 0; wcross_scale += sin(pickup_crosshair_fade); - dprint(strcat(" ------------> ", ftos(getstatf(STAT_PICKUP_CROSSHAIR)), " <-------------\n")); if(shottype == SHOTTYPE_HITENEMY) wcross_scale *= cvar("crosshair_hittest"); // is not queried if hittest is 0 diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 0f59d6e3b..b8c6404c9 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; - self.owner.stat_pickup_crosshair = time; + other.stat_pickup_crosshair = time; pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);