[Scummvm-git-logs] scummvm master -> fd33a890858be24f2d3edcb7afd429216145910b

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd33a89085 XEEN: Fix removing lava damage overlays before starting combat


Commit: fd33a890858be24f2d3edcb7afd429216145910b
    https://github.com/scummvm/scummvm/commit/fd33a890858be24f2d3edcb7afd429216145910b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-27T19:43:41-07:00

Commit Message:
XEEN: Fix removing lava damage overlays before starting combat

Changed paths:
    engines/xeen/combat.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 00e89d6..1452719 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();
 }