Merge remote branch 'origin/terencehill/powerups_respawntime_fix'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:34:10 +0000 (20:34 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:34:10 +0000 (20:34 -0500)
Conflicts:
qcsrc/server/t_items.qc

1  2 
qcsrc/server/arena.qc
qcsrc/server/t_items.qc

Simple merge
@@@ -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;