aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Hamm2002-04-17 21:44:19 +0000
committerVincent Hamm2002-04-17 21:44:19 +0000
commit1a8c30e2256ce234021b3c8e1a37768ec23eb670 (patch)
treeaebedfdd564961bb668593e71caffab131cc8172
parent9adea875fc0ed9c203faa7a0675f2faf4b7cd905 (diff)
downloadscummvm-rg350-1a8c30e2256ce234021b3c8e1a37768ec23eb670.tar.gz
scummvm-rg350-1a8c30e2256ce234021b3c8e1a37768ec23eb670.tar.bz2
scummvm-rg350-1a8c30e2256ce234021b3c8e1a37768ec23eb670.zip
Forced masking for box 0. Correct a few things. Bobbin is buggy when starting a new game in Loom, but that's the consequence of another bug.
svn-id: r3984
-rw-r--r--actor.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/actor.cpp b/actor.cpp
index b021475d50..1db29d563e 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -252,7 +252,10 @@ int Scumm::updateActorDirection(Actor * a)
void Scumm::setActorBox(Actor * a, int box)
{
a->walkbox = box;
- a->mask = getMaskFromBox(box);
+ if(box == 0)
+ a->mask = 1;
+ else
+ a->mask = getMaskFromBox(box);
setupActorScale(a);
}