aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-04-18 00:56:30 +0000
committerJames Brown2002-04-18 00:56:30 +0000
commite9c726f58321fbbeccb60f76c1468781d56d9e1a (patch)
tree373f6f93cf2e7c5d24dab03a5816f5a301b46890
parent1a8c30e2256ce234021b3c8e1a37768ec23eb670 (diff)
downloadscummvm-rg350-e9c726f58321fbbeccb60f76c1468781d56d9e1a.tar.gz
scummvm-rg350-e9c726f58321fbbeccb60f76c1468781d56d9e1a.tar.bz2
scummvm-rg350-e9c726f58321fbbeccb60f76c1468781d56d9e1a.zip
Remove box==0 mask forcing. Yaz - this isn't right.. it breaks all the other games, and I don't think something like this would be a game specific hack.
svn-id: r3985
-rw-r--r--actor.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/actor.cpp b/actor.cpp
index 1db29d563e..9b731e27a8 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -252,10 +252,8 @@ int Scumm::updateActorDirection(Actor * a)
void Scumm::setActorBox(Actor * a, int box)
{
a->walkbox = box;
- if(box == 0)
- a->mask = 1;
- else
- a->mask = getMaskFromBox(box);
+ a->mask = getMaskFromBox(box);
+
setupActorScale(a);
}