diff options
Diffstat (limited to 'engines/sherlock')
-rw-r--r-- | engines/sherlock/animation.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/surface.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp index 7c1f2cd229..21d63633d3 100644 --- a/engines/sherlock/animation.cpp +++ b/engines/sherlock/animation.cpp @@ -88,7 +88,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade, // Draw the sprite. Note that we explicitly use the raw frame below, rather than the ImageFrame, // since we don't want the offsets in the image file to be used, just the explicit position we specify - screen.transBlitFrom(images[imageFrame], pt); + screen.transBlitFrom(images[imageFrame]._frame, pt); } else { // At this point, either the sprites for the frame has been complete, or there weren't any sprites // at all to draw for the frame diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h index 1cb78db072..ccabf02a23 100644 --- a/engines/sherlock/surface.h +++ b/engines/sherlock/surface.h @@ -53,12 +53,6 @@ private: * Draws a sub-section of a surface at a given position within this surface */ void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds); - - /** - * Draws a surface at a given position within this surface with transparency - */ - void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt, - bool flipped = false, int overrideColor = 0); protected: Graphics::Surface _surface; @@ -117,6 +111,12 @@ public: bool flipped = false, int overrideColor = 0); /** + * Draws a surface at a given position within this surface with transparency + */ + void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt, + bool flipped = false, int overrideColor = 0); + + /** * Fill a given area of the surface with a given color */ void fillRect(int x1, int y1, int x2, int y2, byte color); |