From 3bb42aaff76053afc7b5bc76fd64552c778c0e1b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 26 Apr 2019 09:58:58 +0200 Subject: [PATCH] - removed the MaxAmount fudging from MaxHealth. --- wadsrc/static/zscript/actors/inventory/health.zs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wadsrc/static/zscript/actors/inventory/health.zs b/wadsrc/static/zscript/actors/inventory/health.zs index 69a5781df1..e6bc8e4c5b 100644 --- a/wadsrc/static/zscript/actors/inventory/health.zs +++ b/wadsrc/static/zscript/actors/inventory/health.zs @@ -99,9 +99,7 @@ class MaxHealth : Health override bool TryPickup (in out Actor other) { bool success = false; - int savedAmount = MaxAmount; let player = PlayerPawn(other); - MaxAmount = Health; if (player) { if (player.BonusHealth < savedAmount) @@ -109,10 +107,8 @@ class MaxHealth : Health player.BonusHealth = min(player.BonusHealth + Amount, savedAmount); success = true; } - MaxAmount += player.BonusHealth; } success |= Super.TryPickup(other); - MaxAmount = savedAmount; if (success) GoAwayAndDie(); return success; }