aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/magic_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-08-03 00:40:21 +0200
committerJohannes Schickel2011-12-26 16:18:13 +0100
commitaab9e62247af1c22772bb79821675fbab06c047d (patch)
tree2dd15c76b96c3df0778a68c4b546f57797f1cd64 /engines/kyra/magic_eob.cpp
parent48f83b7bb48a1625f6c195e396f8d40047f50915 (diff)
downloadscummvm-rg350-aab9e62247af1c22772bb79821675fbab06c047d.tar.gz
scummvm-rg350-aab9e62247af1c22772bb79821675fbab06c047d.tar.bz2
scummvm-rg350-aab9e62247af1c22772bb79821675fbab06c047d.zip
KYRA: (EOB) - some more sequence code and bug fixes
Diffstat (limited to 'engines/kyra/magic_eob.cpp')
-rw-r--r--engines/kyra/magic_eob.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 70e4892342..3eb7591413 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -75,7 +75,7 @@ void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
}
void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
- EobCharacter *c = &_characters[_openBookChar];
+ EobCharacter *c = &_characters[charIndex];
int val = deleteInventoryItem(charIndex, weaponSlot);
snd_playSoundEffect(10);
@@ -607,6 +607,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
}
bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel) {
+ assert(_monsterProps[m->type].tuResist > 0);
uint8 e = _turnUndeadEffect[_monsterProps[m->type].tuResist * 14 + MIN(casterLevel, 14)];
if (e == 0xff) {