From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 23 Jan 2012 12:27:29 +0000 (+0100)
Subject: workaround for nexball bugs :(
X-Git-Tag: xonotic-v0.6.0~97^2~3
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7bb5df2b06fef28adb124bcd9a83e9ee3d993c71;p=xonotic%2Fxonotic-data.pk3dir.git

workaround for nexball bugs :(
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 4a12ce185..fac0d73aa 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -318,7 +318,7 @@ float W_IsWeaponThrowable(float w)
 		return 0;
 	if (g_cts)
 		return 0;
-	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
+	if (g_nexball && w == WEP_PORTO)
 		return 0;
 
 	wb = W_WeaponBit(w);
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 4b19730ad..b780a8511 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -926,6 +926,9 @@ void readplayerstartcvars()
 	if(!cvar("g_use_ammunition"))
 		start_items |= IT_UNLIMITED_AMMO;
 
+	if(cvar("g_nexball"))
+		start_items |= IT_UNLIMITED_SUPERWEAPONS; // FIXME BAD BAD BAD BAD HACK, NEXBALL SHOULDN'T ABUSE PORTO'S WEAPON SLOT
+
 	if(g_minstagib)
 	{
 		start_ammo_cells = cvar("g_minstagib_ammo_start");