aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2009-04-05 13:15:33 +0000
committerFlorian Kagerer2009-04-05 13:15:33 +0000
commit38737e9c07c04f53f2f00f81f1bade3e70ca7f12 (patch)
tree0421f271baae11e1b787f429336a598a56a6d938
parentf6b313e879a15d80eca978f008810e52aeb55980 (diff)
downloadscummvm-rg350-38737e9c07c04f53f2f00f81f1bade3e70ca7f12.tar.gz
scummvm-rg350-38737e9c07c04f53f2f00f81f1bade3e70ca7f12.tar.bz2
scummvm-rg350-38737e9c07c04f53f2f00f81f1bade3e70ca7f12.zip
LOL: fix monsters' strange sliding to the left (like that thug at the beginning)
svn-id: r39863
-rw-r--r--engines/kyra/sprites_lol.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 1350f41710..7d8ca049a3 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -1370,7 +1370,7 @@ void LoLEngine::rearrangeAttackingMonster(MonsterInPlay *monster) {
if (centered) {
bool r = false;
- if (_levelBlockProperties[monster->blockPropertyIndex].assignedObjects & 0x8000) {
+ if (monster->nextAssignedObject & 0x8000) {
r = true;
} else {
uint16 id = _levelBlockProperties[monster->blockPropertyIndex].assignedObjects;
@@ -1381,8 +1381,7 @@ void LoLEngine::rearrangeAttackingMonster(MonsterInPlay *monster) {
} else {
for (int i = 0; i < 3; i++) {
t = (t + 1) & 3;
- calcNewBlockPosition(monster->blockPropertyIndex, t);
- id = _levelBlockProperties[monster->blockPropertyIndex].assignedObjects;
+ id = _levelBlockProperties[calcNewBlockPosition(monster->blockPropertyIndex, t)].assignedObjects;
id = (id & 0x8000) ? (id & 0x7fff) : 0xffff;
if (id != 0xffff)
r = true;