From: Mario <mario@smbclan.net>
Date: Wed, 9 Mar 2016 06:01:53 +0000 (+1000)
Subject: Don't use a countdown if the powerup is set to respawn quickly
X-Git-Tag: xonotic-v0.8.2~1145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=429db088a06151f9b9abd2f29ba29f489a99ee6d;p=xonotic%2Fxonotic-data.pk3dir.git

Don't use a countdown if the powerup is set to respawn quickly
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 876bc6347..c4eea40ee 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -582,7 +582,8 @@ void Item_RespawnThink()
 
 void Item_ScheduleRespawnIn(entity e, float t)
 {
-	if (Item_ItemsTime_Allow(e.itemdef) || e.weapons & WEPSET_SUPERWEAPONS)
+	// if the respawn time is longer than 10 seconds, show a waypoint, otherwise, just respawn normally
+	if ((Item_ItemsTime_Allow(e.itemdef) || e.weapons & WEPSET_SUPERWEAPONS) && (t - ITEM_RESPAWN_TICKS) > 0)
 	{
 		e.think = Item_RespawnCountdown;
 		e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);