[Scummvm-cvs-logs] SF.net SVN: scummvm:[39863] scummvm/trunk/engines/kyra/sprites_lol.cpp
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Apr 5 15:15:33 CEST 2009
Revision: 39863
http://scummvm.svn.sourceforge.net/scummvm/?rev=39863&view=rev
Author: athrxx
Date: 2009-04-05 13:15:33 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
LOL: fix monsters' strange sliding to the left (like that thug at the beginning)
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sprites_lol.cpp
Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-04-05 12:59:54 UTC (rev 39862)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-04-05 13:15:33 UTC (rev 39863)
@@ -1370,7 +1370,7 @@
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 @@
} 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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list