Merge remote branch 'origin/master' into terencehill/hud_config_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qc

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 7c6c28bf5b361ef6c511ba1702a9ade5e04d6d08..b780a8511a882f96ace60faa8e8a82a9223002c3 100644 (file)
--- 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;
@@ -925,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");