[Scummvm-git-logs] scummvm master -> ce3b1af5c56d4752edc206801f6967173ecb8047

[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:
ce3b1af5c5 XEEN: Correctly skip over unconscious or dead chars during combat


Commit: ce3b1af5c56d4752edc206801f6967173ecb8047
    https://github.com/scummvm/scummvm/commit/ce3b1af5c56d4752edc206801f6967173ecb8047
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-21T19:13:52-05:00

Commit Message:
XEEN: Correctly skip over unconscious or dead chars during combat

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 3045789..7775ada 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1817,7 +1817,7 @@ void Interface::nextChar() {
 			if (combat._whosTurn < (int)combat._combatParty.size()) {
 				// If it's a party member, only allow them to become active if
 				// they're still conscious
-				if (combat._combatParty[idx]->isDisabledOrDead())
+				if (combat._combatParty[combat._whosTurn]->isDisabledOrDead())
 					continue;
 			}