[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.8,1.9
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 20 17:24:11 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.23,1.24 string.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.6,1.7 imuse_channel.cpp,1.9,1.10 player.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv26508/scumm
Modified Files:
actor.cpp
Log Message:
partial fix for bug #605970
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- actor.cpp 19 Sep 2002 10:42:10 -0000 1.8
+++ actor.cpp 21 Sep 2002 00:23:45 -0000 1.9
@@ -1099,6 +1099,11 @@
abr.dist = 0;
walkbox = 0;
} else {
+ // FIXME: this prevents part of bug #605970 (Loom) from occuring. Not sure
+ // if there is a better way to achieve this.
+ if (walkbox == 0)
+ adjustActorPos();
+
if (_vm->checkXYInBoxBounds(walkdata.destbox, abr.x, abr.y)) {
abr.dist = walkdata.destbox;
} else {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.23,1.24 string.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.6,1.7 imuse_channel.cpp,1.9,1.10 player.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list