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 60be1ebef04cadce3eca20549c73993980b72997..df2f52e4c97f7b6d598d99089fc560167ac31116 100644 (file)
--- 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 0f59d6e3bbf98e20f00d46af7bc416302ad2bd87..b8c6404c9a7dbd80021a740f1ba8c2ed4deaa4ac 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;
 
-       self.owner.stat_pickup_crosshair = time;
+       other.stat_pickup_crosshair = time;
 
        pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);