aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2004-01-14 03:07:29 +0000
committerMax Horn2004-01-14 03:07:29 +0000
commite3a28ad4b7d1b73d83a660f1a0535f957f42dbfd (patch)
tree1b724a370328dabdb68ab6dd7dd9db60aa89d283 /scumm/actor.cpp
parent05b9f4ddf6d519b467280a1dd129054d83075242 (diff)
downloadscummvm-rg350-e3a28ad4b7d1b73d83a660f1a0535f957f42dbfd.tar.gz
scummvm-rg350-e3a28ad4b7d1b73d83a660f1a0535f957f42dbfd.tar.bz2
scummvm-rg350-e3a28ad4b7d1b73d83a660f1a0535f957f42dbfd.zip
... and so we are back at precisely my original code, wasn't it fun? :-)
svn-id: r12367
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 9b6c9dd5bc..659d071e17 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1217,18 +1217,14 @@ void Actor::setActorCostume(int c) {
costumeNeedsInit = true;
if (_vm->_features & GF_NEW_COSTUMES) {
+ cost.reset();
memset(animVariable, 0, sizeof(animVariable));
+ costume = c;
if (visible) {
- cost.reset();
- costume = c;
if (costume) {
_vm->ensureResourceLoaded(rtCostume, costume);
}
- startAnimActor(initFrame);
- } else {
- costume = c;
- cost.reset();
}
} else {
if (visible) {