aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorathrxx2011-10-30 00:51:39 +0200
committerathrxx2011-11-04 21:46:31 +0100
commit99aaf242016f02b2aa0f65469e3f79139424e4d4 (patch)
treeefaff03b1cc55c1c2c9ac7d19d7f56e1324b7827 /engines/kyra
parent19458cf03fdfcf6141da96d6efe9424bd394b39f (diff)
downloadscummvm-rg350-99aaf242016f02b2aa0f65469e3f79139424e4d4.tar.gz
scummvm-rg350-99aaf242016f02b2aa0f65469e3f79139424e4d4.tar.bz2
scummvm-rg350-99aaf242016f02b2aa0f65469e3f79139424e4d4.zip
KYRA: fix monster hp in LoL
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/script_lol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index c0a99f9cb3..91fada9e2a 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -842,7 +842,7 @@ int LoLEngine::olol_initMonster(EMCState *script) {
l->direction = l->facing << 1;
l->hitPoints = (l->properties->hitPoints * _monsterModifiers[_monsterDifficulty]) >> 8;
- if (_currentLevel == 12 && l->type == 2)
+ if (_currentLevel != 12 || l->type != 2)
l->hitPoints = (l->hitPoints * (rollDice(1, 128) + 192)) >> 8;
l->numDistAttacks = l->properties->numDistAttacks;
@@ -859,7 +859,7 @@ int LoLEngine::olol_initMonster(EMCState *script) {
l->destDirection = l->direction;
for (int ii = 0; ii < 4; ii++)
- l->equipmentShapes[ii] = stackPos(7 + ii);
+ l->equipmentShapes[ii] = stackPos(7 + ii) & 0xff;
checkSceneUpdateNeed(l->block);
return i;