Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

Conflicts:
	qcsrc/server/t_items.qc

diff --cc qcsrc/server/arena.qc
Simple merge

diff --cc qcsrc/server/t_items.qc
index 4afccd9bee8c7c385177e0038ef677281783ce4b,c507581de5d0d53e679feec6dcd2ad93777f0026..b26c840ff0c8834ba446c01939fe8760095a95c1
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -558,21 -528,6 +558,24 @@@ void Item_Touch (void
        }
  }
  
 +void Item_Reset()
 +{
 +      Item_Show(self, !self.state);
 +      setorigin (self, self.origin);
 +
 +      if(self.classname != "droppedweapon")
 +      {
 +              self.think = SUB_Null;
 +              self.nextthink = 0;
 +
++              if(self.waypointsprite_attached)
++                      WaypointSprite_Kill(self.waypointsprite_attached);
++
 +              if((self.flags & FL_POWERUP) | (self.weapons & WEPBIT_SUPERWEAPONS)) // do not spawn powerups initially!
 +                      Item_ScheduleInitialRespawn(self);
 +      }
 +}
 +
  void Item_FindTeam()
  {
        entity head, e;