workaround for nexball bugs :(

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 4a12ce1850323e10f7b11282a76874cb0f426e66..fac0d73aa2cbf09b30f36ed949e7bb97a9d26085 100644 (file)
--- 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 4b19730adcd3d15f9708bebbe7846a608598ea77..b780a8511a882f96ace60faa8e8a82a9223002c3 100644 (file)
--- 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");