From d5d509ea10026f839fde73fa471c95e27b477a2c Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 16 Jun 2019 13:32:01 +0300 Subject: [PATCH] - switched to unconditional level exit in scriptified actors Action special may not work properly in a very specific setup E.g., exit to the next level within a hub via boss brain death was broken --- wadsrc/static/zscript/actors/doom/bossbrain.zs | 2 +- wadsrc/static/zscript/actors/strife/entityboss.zs | 2 +- wadsrc/static/zscript/actors/strife/programmer.zs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wadsrc/static/zscript/actors/doom/bossbrain.zs b/wadsrc/static/zscript/actors/doom/bossbrain.zs index a3b96d7fa..d45f85cf7 100644 --- a/wadsrc/static/zscript/actors/doom/bossbrain.zs +++ b/wadsrc/static/zscript/actors/doom/bossbrain.zs @@ -214,7 +214,7 @@ extend class Actor } } while (count != 0); } - Exit_Normal(0); + Level.ExitLevel(0, false); } void A_BrainSpit(class spawntype = null) diff --git a/wadsrc/static/zscript/actors/strife/entityboss.zs b/wadsrc/static/zscript/actors/strife/entityboss.zs index 6905b36fc..107442e28 100644 --- a/wadsrc/static/zscript/actors/strife/entityboss.zs +++ b/wadsrc/static/zscript/actors/strife/entityboss.zs @@ -289,7 +289,7 @@ class EntitySecond : SpectralMonster { if (CheckBossDeath ()) { - Exit_Normal(0); + Level.ExitLevel(0, false); } } } diff --git a/wadsrc/static/zscript/actors/strife/programmer.zs b/wadsrc/static/zscript/actors/strife/programmer.zs index a3af76a71..c835a5ba8 100644 --- a/wadsrc/static/zscript/actors/strife/programmer.zs +++ b/wadsrc/static/zscript/actors/strife/programmer.zs @@ -211,7 +211,7 @@ class ProgLevelEnder : Inventory { special1 = 255; special2 = 1; - Exit_Normal(0); + Level.ExitLevel(0, false); } } else