From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 12 Jan 2012 13:53:53 +0000 (+0100)
Subject: also make minstanex a superweapon
X-Git-Tag: xonotic-v0.6.0~177^2^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=082b3ba0c17aa52a7ade2fabca6154df74a68b09;p=xonotic%2Fxonotic-data.pk3dir.git

also make minstanex a superweapon
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index fa2acdd9b..40b82224b 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -751,7 +751,7 @@ void PutClientInServer (void)
 			self.weapons = start_weapons;
 		}
 
-		if(self.weapons & WEPBIT_SUPERWEAPONS)
+		if(self.weapons & WEPBIT_SUPERWEAPONS) // exception for minstagib, as minstanex is a superweapon
 			self.superweapons_finished = time + autocvar_g_balance_superweapons_time;
 		else
 			self.superweapons_finished = 0;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 7c6c28bf5..4b19730ad 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -908,6 +908,7 @@ void readplayerstartcvars()
 		start_weapons = WEPBIT_MINSTANEX;
 		weapon_action(WEP_MINSTANEX, WR_PRECACHE);
 		g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
+		start_items |= IT_UNLIMITED_SUPERWEAPONS;
 
 		if (g_minstagib_invis_alpha <= 0)
 			g_minstagib_invis_alpha = -1;
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 34c71cf50..ae71b2d9e 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
+REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS | IT_SUPERWEAPON, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
 #else
 #ifdef SVQC
 .float minstanex_lasthit;