diff options
| -rw-r--r-- | engines/mads/assets.cpp | 8 | ||||
| -rw-r--r-- | engines/mads/assets.h | 1 | ||||
| -rw-r--r-- | engines/mads/sprites.cpp | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp index 3e18a6711e..bb6f5bd1eb 100644 --- a/engines/mads/assets.cpp +++ b/engines/mads/assets.cpp @@ -203,16 +203,12 @@ MSprite *SpriteAsset::getFrame(int frameIndex) { void SpriteAsset::drawScaled(int frameNumber, MSurface &depthSurface, MSurface &destSurface, int scale, int depth, const Common::Point &pos) { - warning("TODO: SpriteAsset::drawScaled"); -} - -void SpriteAsset::draw(MSurface *surface, int frameNumber, const Common::Point &pt) { - error("TODO: draw"); + error("TODO: SpriteAsset::drawScaled - map to frame methods"); } void SpriteAsset::depthDraw(MSurface *surface, MSurface *depthSurface, int frameNumber, const Common::Point &pt, int depth) { - error("TODO: depthDraw"); + error("TODO: map depthDraw to frame draw methods"); } /*------------------------------------------------------------------------*/ diff --git a/engines/mads/assets.h b/engines/mads/assets.h index a5d3b3ecef..dfe6db086e 100644 --- a/engines/mads/assets.h +++ b/engines/mads/assets.h @@ -108,7 +108,6 @@ public: void drawScaled(int frameNumber, MSurface &depthSurface, MSurface &destSurface, int scale, int depth, const Common::Point &pos); - void draw(MSurface *surface, int frameNumber, const Common::Point &pt); void depthDraw(MSurface *surface, MSurface *depthSurface, int frameNumber, const Common::Point &pt, int depth); }; diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp index 85e36d6c76..f187295b00 100644 --- a/engines/mads/sprites.cpp +++ b/engines/mads/sprites.cpp @@ -254,8 +254,9 @@ void SpriteSlots::drawBackground() { pt.y -= frame->h / 2; } + if (spriteSlot._depth <= 1) { - asset->draw(&scene._backgroundSurface, spriteSlot._frameNumber, pt); + frame->copyTo(&scene._backgroundSurface, frame->getTransparencyIndex()); } else if (scene._depthStyle == 0) { asset->depthDraw(&scene._backgroundSurface, &scene._depthSurface, spriteSlot._frameNumber, pt, spriteSlot._depth); |