XEEN: Fix crash setting up combat speed table for new games

scummvm · Mar 17, 2018 · 902c984 · 902c984
1 parent 637dede
commit 902c984
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))