aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/actor.cpp b/actor.cpp
index 5eb833313b..2ee25a12c5 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -322,6 +322,7 @@ void Scumm::setupActorScale(Actor * a)
byte *resptr;
int y;
+
if (_features & GF_NO_SCALLING) {
a->scalex = 0xFF;
a->scaley = 0xFF;
@@ -331,6 +332,9 @@ void Scumm::setupActorScale(Actor * a)
if (a->ignoreBoxes != 0)
return;
+ if(getBoxFlags(a->walkbox) & 0x20)
+ return;
+
scale = getBoxScale(a->walkbox);
if (scale & 0x8000) {
@@ -913,9 +917,9 @@ void Scumm::drawActorCostume(Actor * a)
if (a == NULL || !a->needRedraw)
return;
- if (g_scumm->getClass(a->number, 20))
+ if (getClass(a->number, 20))
a->mask = 0;
- else if (g_scumm->getClass(a->number, 21))
+ else if (getClass(a->number, 21))
a->forceClip = 1;
if (_gameId==GID_SAMNMAX && getState(995)) // FIXME: ugly fix for samnmax inventory