libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 04:07:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Fix regression in intro sequence display

Browse Source
This commit is contained in:
Paul Gilbert 2015-05-19 19:08:48 -04:00
parent 20d859377d
commit 9c56d616b0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sherlock/animation.cpp
View File

@ -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, // 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 // 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 { } else {
// At this point, either the sprites for the frame has been complete, or there weren't any sprites // 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 // at all to draw for the frame

12
engines/sherlock/surface.h
View File

@ -53,12 +53,6 @@ private:
* Draws a sub-section of a surface at a given position within this surface * 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); 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: protected:
Graphics::Surface _surface; Graphics::Surface _surface;
@ -116,6 +110,12 @@ public:
void transBlitFrom(const Surface &src, const Common::Point &pt, void transBlitFrom(const Surface &src, const Common::Point &pt,
bool flipped = false, int overrideColor = 0); 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 * Fill a given area of the surface with a given color
*/ */