X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ft_items.qc;h=663f14be89fd68a01422aa7416a6d7651eded7d8;hb=629f6f3b55e891281bb265f8022d129d313c110f;hp=a5786888c18169abdfb93a44200b9383feab5a8d;hpb=7f08a396e92c71a2baf9aca2fdba9ca60d6137c0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index a5786888c..663f14be8 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1497,7 +1497,7 @@ spawnfunc(target_items) { for(int j = 0; j < n; ++j) { - if (argv(j) == "unlimited_ammo") this.items |= IT_UNLIMITED_AMMO; + if (argv(j) == "unlimited_ammo") this.items |= IT_UNLIMITED_BOTH; else if(argv(j) == "unlimited_weapon_ammo") this.items |= IT_UNLIMITED_WEAPON_AMMO; else if(argv(j) == "unlimited_superweapons") this.items |= IT_UNLIMITED_SUPERWEAPONS; else if(argv(j) == "strength") this.items |= ITEM_Strength.m_itemid; @@ -1763,7 +1763,7 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveValue(e, strength_finished, op, val); got += GiveValue(e, invincible_finished, op, val); got += GiveValue(e, superweapons_finished, op, val); - got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val); + got += GiveBit(e, items, IT_UNLIMITED_BOTH, op, val); case "all": got += GiveBit(e, items, ITEM_Jetpack.m_itemid, op, val); got += GiveResourceValue(e, RES_HEALTH, op, val); @@ -1781,7 +1781,7 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveResourceValue(e, RES_FUEL, op, val); break; case "unlimited_ammo": - got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val); + got += GiveBit(e, items, IT_UNLIMITED_BOTH, op, val); break; case "unlimited_weapon_ammo": got += GiveBit(e, items, IT_UNLIMITED_WEAPON_AMMO, op, val);