Merge branch 'master' into Lyberta/TeamplayOverhaul

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / t_items.qc

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 04c97948ebb7db6135f9439f17b3c5a5545299fa..28ea1add9f998c8b52f9f463d6e7ca8bc73f50d2 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -746,14 +746,14 @@ float Item_GiveAmmoTo(entity item, entity player, int resource_type, float ammom
                {
                        return false;
                }
                {
                        return false;
                }

-               GiveResourceWithLimit(player, resource_type, amount, ammomax);
+               GiveOrTakeResourceWithLimit(player, resource_type, amount, ammomax);

                return true;
        }
        if (g_weapon_stay != 2)
        {
                return false;
        }
                return true;
        }
        if (g_weapon_stay != 2)
        {
                return false;
        }

-       GiveResourceWithLimit(player, resource_type, amount, min(amount, ammomax));
+       GiveOrTakeResourceWithLimit(player, resource_type, amount, min(amount, ammomax));

        return true;
 }
 
        return true;
 }