diff options
| author | Paul Gilbert | 2016-10-01 17:12:24 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-10-01 17:12:24 -0400 |
| commit | c08c9a72e176213c442f07c23de9728e0187fa0f (patch) | |
| tree | 75309fc562d3ead90991fe73fa9ab49b0978dc82 /engines/titanic/support/video_surface.h | |
| parent | ab88597a4ae653756010ca1758a7080968f0ad81 (diff) | |
| download | scummvm-rg350-c08c9a72e176213c442f07c23de9728e0187fa0f.tar.gz scummvm-rg350-c08c9a72e176213c442f07c23de9728e0187fa0f.tar.bz2 scummvm-rg350-c08c9a72e176213c442f07c23de9728e0187fa0f.zip | |
TITANIC: changePixel is now copyPixel, in progress transparenc blitting
Diffstat (limited to 'engines/titanic/support/video_surface.h')
| -rw-r--r-- | engines/titanic/support/video_surface.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engines/titanic/support/video_surface.h b/engines/titanic/support/video_surface.h index ad868d87ba..cd87f61292 100644 --- a/engines/titanic/support/video_surface.h +++ b/engines/titanic/support/video_surface.h @@ -53,7 +53,7 @@ private: void blitRect1(const Rect &srcRect, const Rect &destRect, CVideoSurface *src); void blitRect2(const Rect &srcRect, const Rect &destRect, CVideoSurface *src); - void transBlitRect(const Rect &srcRect, const Rect &destRect, CVideoSurface *src); + void transBlitRect(const Rect &srcRect, const Rect &destRect, CVideoSurface *src, bool flag); protected: static int _videoSurfaceCounter; protected: @@ -182,9 +182,9 @@ public: virtual void setPixel(const Point &pt, uint pixel) = 0; /** - * Change a pixel + * Copies a pixel, handling transparency */ - virtual void changePixel(uint16 *pixelP, uint16 *color, byte srcVal, bool remapFlag = true) = 0; + virtual void copyPixel(uint16 *destP, const uint16 *srcP, byte transVal, bool is16Bit, bool isAlpha) = 0; /** * Shifts the colors of the surface.. maybe greys it out? @@ -298,7 +298,9 @@ public: /** * Get the previously set transparency mask surface */ - Graphics::ManagedSurface *getTransparencySurface() const { return _transparencySurface; } + const Graphics::Surface *getTransparencySurface() const { + return _transparencySurface ? &_transparencySurface->rawSurface() : nullptr; + } /** * Get the pixels associated with the surface. Only valid when the @@ -433,9 +435,9 @@ public: virtual void setPixel(const Point &pt, uint pixel); /** - * Change a pixel + * Copies a pixel, handling transparency */ - virtual void changePixel(uint16 *pixelP, uint16 *color, byte srcVal, bool remapFlag = true); + virtual void copyPixel(uint16 *destP, const uint16 *srcP, byte transVal, bool is16Bit, bool isAlpha); /** * Shifts the colors of the surface.. maybe greys it out? |