GetResourceAmount --> GetResource, SetResourceAmount --> SetResource

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / buffs / sv_buffs.qc

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 152f93d518772c2a530fa46b7c9ee099ea8ee491..58663be1ac72aafd49268046138727770b250871 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -427,13 +427,13 @@ void buff_Medic_Heal(entity this)
                {
                        continue;
                }
-               float hp = GetResourceAmount(it, RES_HEALTH);
+               float hp = GetResource(it, RES_HEALTH);
                if(hp >= autocvar_g_balance_health_regenstable)
                {
                        continue;
                }
                Send_Effect(EFFECT_HEALING, it.origin, '0 0 0', 1);
-               SetResourceAmount(it, RES_HEALTH, bound(0, hp + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable));
+               SetResource(it, RES_HEALTH, bound(0, hp + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable));
        });
 }
 
@@ -464,11 +464,11 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
                frag_damage *= autocvar_g_buffs_speed_damage_take;
 
        if(STAT(BUFFS, frag_target) & BUFF_MEDIC.m_itemid)
-       if((GetResourceAmount(frag_target, RES_HEALTH) - frag_damage) <= 0)
+       if((GetResource(frag_target, RES_HEALTH) - frag_damage) <= 0)
        if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype))
        if(frag_attacker)
        if(random() <= autocvar_g_buffs_medic_survive_chance)
-               frag_damage = max(5, GetResourceAmount(frag_target, RES_HEALTH) - autocvar_g_buffs_medic_survive_health);
+               frag_damage = max(5, GetResource(frag_target, RES_HEALTH) - autocvar_g_buffs_medic_survive_health);
 
        if(STAT(BUFFS, frag_target) & BUFF_JUMP.m_itemid)
        if(frag_deathtype == DEATH_FALL.m_id)
@@ -544,12 +544,12 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
        if(DIFF_TEAM(frag_attacker, frag_target))
        {
                float amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
-                       GetResourceAmount(frag_target, RES_HEALTH));
+                       GetResource(frag_target, RES_HEALTH));
                GiveResourceWithLimit(frag_attacker, RES_HEALTH, amount, g_pickup_healthsmall_max);
-               if (GetResourceAmount(frag_target, RES_ARMOR))
+               if (GetResource(frag_target, RES_ARMOR))
                {
                        amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
-                               GetResourceAmount(frag_target, RES_ARMOR));
+                               GetResource(frag_target, RES_ARMOR));
                        GiveResourceWithLimit(frag_attacker, RES_ARMOR, amount, g_pickup_armorsmall_max);
                }
        }