From 19007bac4088f4933410438c242814915b20e4ac Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 26 Feb 2015 08:29:04 -0500
Subject: XEEN: Fix hang calling checkEvents when in combat mode

---
 engines/xeen/scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/xeen/scripts.cpp')

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) {
-- 
cgit v1.2.3