aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/scripts.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-02-26 08:29:04 -0500
committerPaul Gilbert2015-02-26 08:29:04 -0500
commit19007bac4088f4933410438c242814915b20e4ac (patch)
tree25add8a545d3bea21ff8c4efb79f94dedd27ecb2 /engines/xeen/scripts.cpp
parent68e30b2967797537a951c5126b89fdb905138cb6 (diff)
downloadscummvm-rg350-19007bac4088f4933410438c242814915b20e4ac.tar.gz
scummvm-rg350-19007bac4088f4933410438c242814915b20e4ac.tar.bz2
scummvm-rg350-19007bac4088f4933410438c242814915b20e4ac.zip
XEEN: Fix hang calling checkEvents when in combat mode
Diffstat (limited to 'engines/xeen/scripts.cpp')
-rw-r--r--engines/xeen/scripts.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 0d701fe3da..ef101b9377 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -167,7 +167,7 @@ int Scripts::checkEvents() {
if (eventIndex == map._events.size())
_lineNum = -1;
}
- } while (!_vm->shouldQuit() && _lineNum != -1);
+ } while (!_vm->shouldQuit() && !_eventSkipped && _lineNum != -1);
intf._face1State = intf._face2State = 2;
if (_refreshIcons) {