diff options
| author | athrxx | 2019-12-16 21:38:51 +0100 |
|---|---|---|
| committer | athrxx | 2019-12-16 21:45:24 +0100 |
| commit | 4b2591b5c935bf5a2835cbfd10ac4202bb23e81b (patch) | |
| tree | 236b03fb7f8d660c7035a8fc23a4d96006802d3f | |
| parent | e6f018543d79ee780b18beb8622354982cdddf29 (diff) | |
| download | scummvm-rg350-4b2591b5c935bf5a2835cbfd10ac4202bb23e81b.tar.gz scummvm-rg350-4b2591b5c935bf5a2835cbfd10ac4202bb23e81b.tar.bz2 scummvm-rg350-4b2591b5c935bf5a2835cbfd10ac4202bb23e81b.zip | |
KYRA: (EOB) - fix stone skin spell warning
(The Amiga version has as special warning message if the spell has already been cast on a character. This warning was not displayed).
| -rw-r--r-- | engines/kyra/engine/magic_eob.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/engine/magic_eob.cpp b/engines/kyra/engine/magic_eob.cpp index 35780f80c7..b6add0888a 100644 --- a/engines/kyra/engine/magic_eob.cpp +++ b/engines/kyra/engine/magic_eob.cpp @@ -322,6 +322,8 @@ void EoBCoreEngine::startSpell(int spell) { if ((s->flags & 0x30) && (s->effectFlags & c->effectFlags)) { if (_flags.gameID == GI_EOB2) printWarning(Common::String::format(_magicStrings7[0], c->name, s->name).c_str()); + else if (spell == 22 && _magicStrings9 && _characters[_activeSpellCharId].effectsRemainder[1]) + _txt->printMessage(_magicStrings9[0], -1, _characters[_activeSpellCharId].name); } else if ((s->flags & 0x50) && (s->effectFlags & _partyEffectFlags)) { if (_flags.gameID == GI_EOB1 && s->effectFlags == 0x400) // EOB 1 only warns in case of a bless spell @@ -1008,10 +1010,7 @@ bool EoBCoreEngine::spellCallback_end_iceStorm(void *obj) { } void EoBCoreEngine::spellCallback_start_stoneSkin() { - if (_magicStrings9[0] && _characters[_activeSpellCharId].effectsRemainder[1]) - _txt->printMessage(_magicStrings9[0], -1, _characters[_activeSpellCharId].name); - else - _characters[_activeSpellCharId].effectsRemainder[1] = (getMageLevel(_openBookChar) >> 1) + rollDice(1, 4); + _characters[_activeSpellCharId].effectsRemainder[1] = (getMageLevel(_openBookChar) >> 1) + rollDice(1, 4); } void EoBCoreEngine::spellCallback_start_removeCurse() { |