aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorRobert Crossfield2012-01-26 21:37:04 +1100
committerTobias Gunkel2012-02-11 08:29:27 +0100
commitcf292001d35b56b4e4741d7519019c57b30d22dd (patch)
tree8594a3626070c38d9215ef5407f960e57eb32bcd /engines/scumm
parent5b4b606a5879ddcbeb43d3c846bdf40f2d864bed (diff)
downloadscummvm-rg350-cf292001d35b56b4e4741d7519019c57b30d22dd.tar.gz
scummvm-rg350-cf292001d35b56b4e4741d7519019c57b30d22dd.tar.bz2
scummvm-rg350-cf292001d35b56b4e4741d7519019c57b30d22dd.zip
SCUMM: Animations fix again, no need for the hack now
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/actor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f5c17078da..47b2582242 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -909,7 +909,8 @@ void ActorC64::setDirection(int direction) {
_animFrameRepeat = -1;
animateActor(res);
- animateCostume();
+ if(_moving)
+ animateCostume();
}
void Actor::faceToObject(int obj) {
@@ -1344,8 +1345,7 @@ void Actor::showActor() {
a->_animFrameRepeat = 1;
a->_speaking = 0;
- if( a->_costume != 0x13 )
- startAnimActor(_standFrame);
+ startAnimActor(_standFrame);
_visible = true;
return;