diff options
| author | Paul Gilbert | 2019-08-27 19:43:35 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-08-27 19:43:41 -0700 |
| commit | fd33a890858be24f2d3edcb7afd429216145910b (patch) | |
| tree | 7b3c1f568ebcd5b6288b93339dfd3b5ca5717488 /engines/xeen | |
| parent | 33c2e1b1dabf377b30f1e6b3a5c07c58fcf4b55c (diff) | |
| download | scummvm-rg350-fd33a890858be24f2d3edcb7afd429216145910b.tar.gz scummvm-rg350-fd33a890858be24f2d3edcb7afd429216145910b.tar.bz2 scummvm-rg350-fd33a890858be24f2d3edcb7afd429216145910b.zip | |
XEEN: Fix removing lava damage overlays before starting combat
Diffstat (limited to 'engines/xeen')
| -rw-r--r-- | engines/xeen/combat.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 00e89d6398..1452719c2b 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(); } |