aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-07-18 04:24:03 +0000
committerTravis Howell2004-07-18 04:24:03 +0000
commit3aa5d9dd069e294234ec84d106d485f7dd07a330 (patch)
treeb3cab958001e4e9040375170ab15e9907ca9f445 /scumm/actor.cpp
parentf02a14427b33715bf79c4f83582a049dcbdd3733 (diff)
downloadscummvm-rg350-3aa5d9dd069e294234ec84d106d485f7dd07a330.tar.gz
scummvm-rg350-3aa5d9dd069e294234ec84d106d485f7dd07a330.tar.bz2
scummvm-rg350-3aa5d9dd069e294234ec84d106d485f7dd07a330.zip
Only change actor.frame if actor's frame is actually updated.
svn-id: r14238
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index d616844ce6..0b9766cb1b 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -448,14 +448,13 @@ void Actor::startAnimActor(int f) {
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 @@ void Actor::startAnimActor(int f) {
}
assert(f != 0x3E);
- frame = f;
if (isInCurrentRoom() && costume != 0) {
animProgress = 0;
@@ -491,6 +489,7 @@ void Actor::startAnimActor(int f) {
_vm->akos_decodeData(this, f, (uint) - 1);
else
_vm->cost_decodeData(this, f, (uint) - 1);
+ frame = f;
}
}
}