[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229.2.8,1.229.2.9
Travis Howell
kirben at users.sourceforge.net
Sat Jul 17 21:44:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20874/scumm
Modified Files:
Tag: branch-0-6-0
actor.cpp
Log Message:
Only change actor.frame if actor's frame is actually updated.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229.2.8
retrieving revision 1.229.2.9
diff -u -d -r1.229.2.8 -r1.229.2.9
--- actor.cpp 17 Jul 2004 08:27:55 -0000 1.229.2.8
+++ actor.cpp 18 Jul 2004 04:43:21 -0000 1.229.2.9
@@ -448,14 +448,13 @@
break;
}
- frame = f;
-
if (costume != 0) {
animProgress = 0;
needRedraw = true;
if (f == initFrame)
cost.reset();
_vm->akos_decodeData(this, f, (uint) - 1);
+ frame = f;
}
} else {
switch (f) {
@@ -477,7 +476,6 @@
}
assert(f != 0x3E);
- frame = f;
if (isInCurrentRoom() && costume != 0) {
animProgress = 0;
@@ -491,6 +489,7 @@
_vm->akos_decodeData(this, f, (uint) - 1);
else
_vm->cost_decodeData(this, f, (uint) - 1);
+ frame = f;
}
}
}
More information about the Scummvm-git-logs
mailing list