libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix double-casting of spells during combat

Browse Source
This commit is contained in:
Paul Gilbert 2018-04-07 18:40:47 -04:00
parent e5ff44eaf3
commit 54ff19bcf5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/xeen/interface.cpp
View File

@ -512,21 +512,18 @@ void Interface::perform() {
}
break;
case Common::KEYCODE_c: {
case Common::KEYCODE_c:
// Cast spell
if (_tillMove) {
combat.moveMonsters();
draw3d(true);
}
int result = CastSpell::show(_vm);
if (result == 1) {
if (CastSpell::show(_vm) != -1) {
chargeStep();
doStepCode();
}
break;
}
case Common::KEYCODE_i:
// Show Info dialog
@ -1442,7 +1439,6 @@ void Interface::doCombat() {
Map &map = *_vm->_map;
Party &party = *_vm->_party;
Scripts &scripts = *_vm->_scripts;
Spells &spells = *_vm->_spells;
Sound &sound = *_vm->_sound;
Windows &windows = *_vm->_windows;
bool upDoorText = _upDoorText;
@ -1556,10 +1552,7 @@ void Interface::doCombat() {
case Common::KEYCODE_c: {
// Cast spell
int spellId = CastSpell::show(_vm);
if (spellId != -1) {
Character *c = combat._combatParty[combat._whosTurn];
spells.castSpell(c, (MagicSpell)spellId);
if (CastSpell::show(_vm) != -1) {
nextChar();
} else {
highlightChar(combat._whosTurn);