From fd33a890858be24f2d3edcb7afd429216145910b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 27 Aug 2019 19:43:35 -0700 Subject: [PATCH] XEEN: Fix removing lava damage overlays before starting combat --- engines/xeen/combat.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 00e89d6398f..1452719c2b5 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -254,7 +254,12 @@ void Combat::giveCharDamage(int damage, DamageType attackType, int charIndex) { breakFlag = true; } + // WORKAROUND: Flag a script in progress when pausing to prevent any pending combat starting prematurely + Mode oldMode = _vm->_mode; + _vm->_mode = MODE_SCRIPT_IN_PROGRESS; events.ipause(5); + _vm->_mode = oldMode; + intf.drawParty(true); party.checkPartyDead(); }