From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Apr 2019 12:48:50 +0000 (+0200)
Subject: Don't apply any time limit to superweapons if enabled in weapon arena mode
X-Git-Tag: xonotic-v0.8.5~1553
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fdc43f2564e14413622cf1163e7f9ac14a547142;p=xonotic%2Fxonotic-data.pk3dir.git

Don't apply any time limit to superweapons if enabled in weapon arena mode
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index c309ed35d..9ea192549 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1857,7 +1857,7 @@ float GiveItems(entity e, float beginarg, float endarg)
 	POSTGIVE_RES_ROT(e, RES_HEALTH, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_MEGAHEALTH, SND_Null);
 
 	if(e.superweapons_finished <= 0)
-		if(STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS)
+		if(!g_weaponarena && STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS)
 			e.superweapons_finished = autocvar_g_balance_superweapons_time;
 
 	if(e.strength_finished <= 0)
diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index af1483932..7e8a061f0 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -134,9 +134,9 @@ bool W_IsWeaponThrowable(entity this, int w)
 	if (!autocvar_g_pickup_items)
 		return false;
 	if (g_weaponarena)
-		return 0;
-    if(w == WEP_Null.m_id)
-        return false;
+		return false;
+	if (w == WEP_Null.m_id)
+		return false;
 
 	return (Weapons_from(w)).weaponthrowable;
 }