X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fresources.qc;h=2356d8eaf443eb625c5bd1687d18720844a541ad;hb=e30214cf338291f1709fb02ed5e84cad9321e156;hp=74a0c55788a71a2f19de6accaeaacba47f1c9c3b;hpb=77d98212622acadc3ed0c658c890a949805e0bdf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc index 74a0c5578..2356d8eaf 100644 --- a/qcsrc/server/resources.qc +++ b/qcsrc/server/resources.qc @@ -77,17 +77,6 @@ float GetResourceAmount(entity e, int resource_type) return e.(resource_field); } -bool SetResourceAmountExplicit(entity e, int resource_type, float amount) -{ - .float resource_field = GetResourceField(resource_type); - if (e.(resource_field) != amount) - { - e.(resource_field) = amount; - return true; - } - return false; -} - void SetResourceAmount(entity e, int resource_type, float amount) { bool forbid = MUTATOR_CALLHOOK(SetResourceAmount, e, resource_type, amount); @@ -104,9 +93,10 @@ void SetResourceAmount(entity e, int resource_type, float amount) amount_wasted = amount - max_amount; amount = max_amount; } - bool changed = SetResourceAmountExplicit(e, resource_type, amount); - if (changed) + .float resource_field = GetResourceField(resource_type); + if (e.(resource_field) != amount) { + e.(resource_field) = amount; MUTATOR_CALLHOOK(ResourceAmountChanged, e, resource_type, amount); } if (amount_wasted == 0)