XEEN: Implement extra code for passing active character to castSpell

1 files changed, 23 insertions, 5 deletions

diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 3bd3ef12b6..7efc7a7068 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -521,9 +521,25 @@ void Interface::perform() {
 
 	case Common::KEYCODE_c: {
 		// Cast spell
-		int spellId = CastSpell::show(_vm, _vm->_mode);
-		if (spellId != -1)
-			spells.castSpell(spellId);
+		if (_tillMove) {
+			combat.moveMonsters();
+			draw3d(true);
+		}
+
+		int result = 0;
+		do {
+			Character *c = nullptr;
+			int spellId = CastSpell::show(_vm, c, _vm->_mode);
+			if (spellId == -1 || c == nullptr)
+				break;
+
+			result = spells.castSpell(c, spellId);
+		} while (result != -1);
+
+		if (result == 1) {
+			chargeStep();
+			doStepCode();
+		}
 		break;
 	}
 
@@ -1952,8 +1968,10 @@ void Interface::doCombat() {
 			case Common::KEYCODE_c: {
 				// Cast spell
 				int spellId = CastSpell::show(_vm, _vm->_mode);
-				if (spellId != -1)
-					spells.castSpell(spellId);
+				if (spellId != -1) {
+					Character *c = combat._combatParty[combat._whosTurn];
+					spells.castSpell(c, spellId);
+				}
 				break;
 			}