From: Mario <mario@smbclan.net>
Date: Wed, 2 Dec 2015 11:47:22 +0000 (+1000)
Subject: Apply a temporary fix for superweapons
X-Git-Tag: xonotic-v0.8.2~1583
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dce7d5d54b69058564d7335e4fc90c7d61ba73bd;p=xonotic%2Fxonotic-data.pk3dir.git

Apply a temporary fix for superweapons
---

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 244f6a5e6..923c2aa4a 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -111,7 +111,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 
 	if (!this.respawntime)
 	{
-		if (e.weapons & WEPSET_SUPERWEAPONS)
+		if (e.spawnflags & WEP_FLAG_SUPERWEAPON)
 		{
 			this.respawntime = g_pickup_respawntime_superweapon;
 			this.respawntimejitter = g_pickup_respawntimejitter_superweapon;
@@ -123,9 +123,12 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 		}
 	}
 
-	if (e.weapons & WEPSET_SUPERWEAPONS)
+	if (e.spawnflags & WEP_FLAG_SUPERWEAPON)
 		if (!this.superweapons_finished)
+		{
 			this.superweapons_finished = autocvar_g_balance_superweapons_time;
+			LOG_INFO("Setting it to ", ftos(this.superweapons_finished), " on ", e.mdl, "\n");
+		}
 
 	// if we don't already have ammo, give us some ammo
 	if (!this.(e.ammo_field))