Skip to content

Commit a61f16c

Browse files
committed
MM: MM1: Don't cast spell if none selected
1 parent be4beee commit a61f16c

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

engines/mm/mm1/views_enh/spells/cast_spell.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,19 @@ void CastSpell::draw() {
8282
bool CastSpell::msgKeypress(const KeypressMessage &msg) {
8383
if (msg.keycode == Common::KEYCODE_c) {
8484
// Cast a spell
85-
if (!canCast()) {
86-
close();
87-
spellError();
88-
} else if (hasCharTarget()) {
89-
addView("CharacterSelect");
90-
} else {
91-
close();
92-
castSpell();
85+
const Character &c = *g_globals->_currCharacter;
86+
if (c._nonCombatSpell != -1) {
87+
if (!canCast()) {
88+
close();
89+
spellError();
90+
} else if (hasCharTarget()) {
91+
addView("CharacterSelect");
92+
} else {
93+
close();
94+
castSpell();
95+
}
9396
}
97+
9498
return true;
9599

96100
} else if (msg.keycode == Common::KEYCODE_n) {

0 commit comments

Comments
 (0)