[Scummvm-git-logs] scummvm master -> 68365f3c5484d3d28ed900f301da97a71d8c0a84

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
68365f3c54 XEEN: Fix crash escaping Cast Spell dialog during combat


Commit: 68365f3c5484d3d28ed900f301da97a71d8c0a84
    https://github.com/scummvm/scummvm/commit/68365f3c5484d3d28ed900f301da97a71d8c0a84
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-31T22:29:15-04:00

Commit Message:
XEEN: Fix crash escaping Cast Spell dialog during combat

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 810bfd6..8e973f7 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;
 			}