[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.216,1.217
Travis Howell
kirben at users.sourceforge.net
Wed Jan 14 19:04:00 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10498/scumm
Modified Files:
actor.cpp
Log Message:
Only stop walkScript if it is been used.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- actor.cpp 15 Jan 2004 02:59:51 -0000 1.216
+++ actor.cpp 15 Jan 2004 03:03:00 -0000 1.217
@@ -90,7 +90,8 @@
memset(sound, 0, sizeof(sound));
targetFacing = facing;
- _vm->stopScript(walkScript);
+ if (walkScript)
+ _vm->stopScript(walkScript);
moving = 0;
shadow_mode = 0;
@@ -701,9 +702,8 @@
moving = 0;
cost.soundCounter = 0;
- if (_vm->_features & GF_NEW_COSTUMES) {
+ if (walkScript)
_vm->stopScript(walkScript);
- }
if (walkbox != kInvalidBox) {
byte flags = _vm->getBoxFlags(walkbox);
More information about the Scummvm-git-logs
mailing list