Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

Conflicts:
	qcsrc/server/t_items.qc

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index e1c210a3dc23f24f3b9fb5e0b1cf3080df114c75..ef81fd92bad7db138edb2fa1e1067d252bae875b 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -47,7 +47,7 @@ void reset_map(float dorespawn)
        race_ReadyRestart();
 
        for(self = world; (self = nextent(self)); )
-       if(clienttype(self) == CLIENTTYPE_NOTACLIENT && self.items != IT_STRENGTH && self.items != IT_INVINCIBLE) // don't respawn strength or shield, that will only lead to them spawning very early each match
+       if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
        {
                if(self.reset)
                {

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 4afccd9bee8c7c385177e0038ef677281783ce4b..b26c840ff0c8834ba446c01939fe8760095a95c1 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -568,6 +568,9 @@ void Item_Reset()
                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);
        }