From 68365f3c5484d3d28ed900f301da97a71d8c0a84 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 31 Mar 2018 22:29:15 -0400
Subject: XEEN: Fix crash escaping Cast Spell dialog during combat

---
 engines/xeen/interface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 810bfd64cf..8e973f793e 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -103,6 +103,7 @@ void PartyDrawer::drawParty(bool updateFlag) {
 void PartyDrawer::highlightChar(int charId) {
 	Resources &res = *_vm->_resources;
 	Windows &windows = *_vm->_windows;
+	assert(charId < MAX_ACTIVE_PARTY);
 
 	if (charId != _hiliteChar && _hiliteChar != HILIGHT_CHAR_DISABLED) {
 		// Handle deselecting any previusly selected char
@@ -1567,7 +1568,7 @@ void Interface::doCombat() {
 					spells.castSpell(c, (MagicSpell)spellId);
 					nextChar();
 				} else {
-					highlightChar(combat._combatParty[combat._whosTurn]->_rosterId);
+					highlightChar(combat._whosTurn);
 				}
 				break;
 			}
-- 
cgit v1.2.3