From: Samual <samual@xonotic.org>
Date: Sun, 26 Feb 2012 01:34:10 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/powerups_respawntime_fix'
X-Git-Tag: xonotic-v0.6.0~42^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dbdc35464a18f62bf550a20eddac9ec16b0eacee;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

Conflicts:
	qcsrc/server/t_items.qc
---

dbdc35464a18f62bf550a20eddac9ec16b0eacee
diff --cc qcsrc/server/t_items.qc
index 4afccd9be,c507581de..b26c840ff
--- a/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;