X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fonslaught%2Fsv_onslaught.qc;h=fd050df0a0f541cc0137303fe86ad15ab26ba60b;hp=12475bb7327ea84d1d72900bfd781c1d1d0f260b;hb=50d6cb6a02a959a7303b5b687631b664a807b26f;hpb=aa69b91af5a7b45229c6f9fbf18214b4b17c5a84 diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 12475bb73..fd050df0a 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -449,7 +449,7 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker bool ons_ControlPoint_Icon_Heal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit) ? limit : targ.max_health); + float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit) return false; @@ -963,7 +963,7 @@ void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float d bool ons_GeneratorHeal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit) ? limit : targ.max_health); + float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit) return false;