From b70bc2b152d85dc98c352d7a8dabcdb00111cef3 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sat, 9 May 2020 16:16:45 -0500 Subject: [PATCH 1/2] Fixed an issue where multiple invulnerability powerups could cancel each other out from just one expiring. --- wadsrc/static/zscript/actors/inventory/powerups.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs index 6ac852aba..aaea85142 100644 --- a/wadsrc/static/zscript/actors/inventory/powerups.zs +++ b/wadsrc/static/zscript/actors/inventory/powerups.zs @@ -356,7 +356,7 @@ class PowerInvulnerable : Powerup { return; } - + Owner.bInvulnerable = true; if (Mode == 'Ghost') { if (!Owner.bShadow) From 079e7ee4e9760a66ca830d4c803075db293dfd90 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sat, 9 May 2020 16:44:23 -0500 Subject: [PATCH 2/2] Enforce the reflective flag as well. --- wadsrc/static/zscript/actors/inventory/powerups.zs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wadsrc/static/zscript/actors/inventory/powerups.zs b/wadsrc/static/zscript/actors/inventory/powerups.zs index aaea85142..157fab1b2 100644 --- a/wadsrc/static/zscript/actors/inventory/powerups.zs +++ b/wadsrc/static/zscript/actors/inventory/powerups.zs @@ -357,6 +357,10 @@ class PowerInvulnerable : Powerup return; } Owner.bInvulnerable = true; + if (Mode == 'Reflective') + { + Owner.bReflective = true; + } if (Mode == 'Ghost') { if (!Owner.bShadow)