diff options
author | Eugene Sandulenko | 2014-06-17 14:07:19 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2014-06-17 14:07:19 +0300 |
commit | 343910d3ce604149fa885dd562a113da7bbd05c8 (patch) | |
tree | f7d3149e4567757beccb8086c38d2b57ec70d99f /engines | |
parent | 8738d55b049c996578749010bfca33985e4da4aa (diff) | |
download | scummvm-rg350-343910d3ce604149fa885dd562a113da7bbd05c8.tar.gz scummvm-rg350-343910d3ce604149fa885dd562a113da7bbd05c8.tar.bz2 scummvm-rg350-343910d3ce604149fa885dd562a113da7bbd05c8.zip |
FULLPIPE: Switch graphics to TransparentSurface
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/fullpipe.h | 2 | ||||
-rw-r--r-- | engines/fullpipe/gfx.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/gfx.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index afdc493258..181e82c826 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -32,7 +32,7 @@ #include "audio/mixer.h" -#include "graphics/surface.h" +#include "graphics/transparent_surface.h" #include "engines/engine.h" diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp index 220892d67e..5f8177cdc0 100644 --- a/engines/fullpipe/gfx.cpp +++ b/engines/fullpipe/gfx.cpp @@ -54,7 +54,7 @@ Bitmap::Bitmap(Bitmap *src) { _width = src->_width; _height = src->_height; _pixels = src->_pixels; - _surface = new Graphics::Surface(*src->_surface); + _surface = new Graphics::TransparentSurface(*src->_surface); } Bitmap::~Bitmap() { @@ -839,7 +839,7 @@ bool Bitmap::isPixelAtHitPosRB(int x, int y) { } void Bitmap::decode(int32 *palette) { - _surface = new Graphics::Surface; + _surface = new Graphics::TransparentSurface; _surface->create(_width, _height, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)); @@ -881,7 +881,7 @@ void Bitmap::putDib(int x, int y, int32 *palette) { if (sub.width() <= 0 || sub.height() <= 0) return; - g_fp->_backgroundSurface.copyRectToSurface(*_surface, x1, y1, sub); + _surface->blit(g_fp->_backgroundSurface, x1, y1, Graphics::FLIP_NONE, &sub); g_fp->_system->copyRectToScreen(g_fp->_backgroundSurface.getBasePtr(x1, y1), g_fp->_backgroundSurface.pitch, x1, y1, sub.width(), sub.height()); } diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h index ddf153e14e..48c90a6c31 100644 --- a/engines/fullpipe/gfx.h +++ b/engines/fullpipe/gfx.h @@ -38,7 +38,7 @@ struct Bitmap { int _type; int _dataSize; int _flags; - Graphics::Surface *_surface; + Graphics::TransparentSurface *_surface; Bitmap(); Bitmap(Bitmap *src); |