diff options
| author | James Brown | 2002-05-10 16:08:22 +0000 |
|---|---|---|
| committer | James Brown | 2002-05-10 16:08:22 +0000 |
| commit | 22cd647bbe0bd3d18899ddd76f1f5ddf47e3b1fb (patch) | |
| tree | 3137fadd65715829b75ad80df3501359a56f91fd /actor.cpp | |
| parent | 875e37020742699b31401e65fa4f2aa70d39bf19 (diff) | |
| download | scummvm-rg350-22cd647bbe0bd3d18899ddd76f1f5ddf47e3b1fb.tar.gz scummvm-rg350-22cd647bbe0bd3d18899ddd76f1f5ddf47e3b1fb.tar.bz2 scummvm-rg350-22cd647bbe0bd3d18899ddd76f1f5ddf47e3b1fb.zip | |
Fix mystery vortex freeze.
svn-id: r4264
Diffstat (limited to 'actor.cpp')
| -rw-r--r-- | actor.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 |