aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/surface.h
diff options
context:
space:
mode:
authorPaul Gilbert2015-08-02 19:04:48 -0400
committerPaul Gilbert2015-08-02 19:04:48 -0400
commitb06cfaed9c2f890551d357fbc88fd7359b7f9158 (patch)
tree3767383ebf495f6596d46eb6224520b07800fc53 /engines/sherlock/surface.h
parent9f74d342a87da25c96550f2528e0eab67eb6897a (diff)
downloadscummvm-rg350-b06cfaed9c2f890551d357fbc88fd7359b7f9158.tar.gz
scummvm-rg350-b06cfaed9c2f890551d357fbc88fd7359b7f9158.tar.bz2
scummvm-rg350-b06cfaed9c2f890551d357fbc88fd7359b7f9158.zip
SHERLOCK: RT: Fix transparency when dragging lab items with cursor
Diffstat (limited to 'engines/sherlock/surface.h')
-rw-r--r--engines/sherlock/surface.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index dd1a199b1f..385fb1793e 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -50,11 +50,6 @@ private:
void blitFrom(const Graphics::Surface &src);
/**
- * Draws a surface at a given position within this surface
- */
- void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
-
- /**
* 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);
@@ -113,6 +108,11 @@ public:
void blitFrom(const ImageFrame &src, const Common::Point &pt, const Common::Rect &srcBounds);
/**
+ * Draws a surface at a given position within this surface
+ */
+ void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+
+ /**
* Draws an image frame at a given position within this surface with transparency
*/
void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
@@ -174,6 +174,7 @@ public:
inline byte *getPixels() { return (byte *)_surface.getPixels(); }
inline byte *getBasePtr(int x, int y) { return (byte *)_surface.getBasePtr(x, y); }
inline const byte *getBasePtr(int x, int y) const { return (const byte *)_surface.getBasePtr(x, y); }
+ inline Graphics::Surface &getRawSurface() { return _surface; }
inline void hLine(int x, int y, int x2, uint32 color) { _surface.hLine(x, y, x2, color); }
inline void vLine(int x, int y, int y2, uint32 color) { _surface.vLine(x, y, y2, color); }
};