From 902c984cf5c367d9bfb1d8cdfac4fb887b921d3e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Mar 2018 07:12:01 -0400
Subject: XEEN: Fix crash setting up combat speed table for new games

---
 engines/xeen/combat.cpp    | 2 +-
 engines/xeen/interface.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/xeen')

diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 6c293bc36d..6422b7284f 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1116,7 +1116,7 @@ void Combat::setSpeedTable() {
 	}
 
 	if (hasSpeed) {
-		if (_speedTable[_whosSpeed] != oldSpeed) {
+		if (_whosSpeed >= (int)_speedTable.size() || _speedTable[_whosSpeed] != oldSpeed) {
 			for (_whosSpeed = 0; _whosSpeed < (int)charSpeeds.size(); ++_whosSpeed) {
 				if (oldSpeed == _speedTable[_whosSpeed])
 					break;
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index b994a99713..96f44bb690 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -267,7 +267,7 @@ void Interface::perform() {
 		_buttonValue = 0;
 		do {
 			events.pollEventsAndWait();
-			if (party._partyDead)
+			if (g_vm->shouldExit() || party._partyDead)
 				return;
 
 			if (events._leftButton && WAIT_BOUNDS.contains(events._mousePos))
-- 
cgit v1.2.3