Merge branch 'master' into martin-t/AMMO

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 4cc848b67342e53181701fe6b06f1463d9319db3..c82f076d39531003262d0671667806ccc29ef88c 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -715,7 +715,7 @@ void readplayerstartcvars()
        {
                g_weapon_stay = 0; // incompatible
                start_weapons = g_weaponarena_weapons;
-               start_items |= IT_UNLIMITED_AMMO;
+               start_items |= IT_UNLIMITED_BOTH;
        }
        else
        {
@@ -735,7 +735,7 @@ void readplayerstartcvars()
                start_items |= IT_UNLIMITED_SUPERWEAPONS;
 
        if(!cvar("g_use_ammunition"))
-               start_items |= IT_UNLIMITED_AMMO;
+               start_items |= IT_UNLIMITED_WEAPON_AMMO;
 
        if(start_items & IT_UNLIMITED_WEAPON_AMMO)
        {