diff options
| author | Einar Johan Trøan Sømåen | 2013-09-30 11:23:36 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-09-30 11:23:57 +0200 |
| commit | 48ad18d2664f83271613191351b7b92d06fd5cf0 (patch) | |
| tree | ecc1f5266ec16bb2aa4c45a0152c420ac447f4e3 /engines/wintermute/base/gfx | |
| parent | af8fa194be7abdb9f72d50a558a1dbcb3e666c9f (diff) | |
| parent | ccd3258bdccaf7290137aea5b98889a9568547db (diff) | |
| download | scummvm-rg350-48ad18d2664f83271613191351b7b92d06fd5cf0.tar.gz scummvm-rg350-48ad18d2664f83271613191351b7b92d06fd5cf0.tar.bz2 scummvm-rg350-48ad18d2664f83271613191351b7b92d06fd5cf0.zip | |
Merge branch 'refac'
Conflicts:
engines/wintermute/graphics/transparent_surface.cpp
engines/wintermute/graphics/transparent_surface.h
Diffstat (limited to 'engines/wintermute/base/gfx')
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/render_ticket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp index d79d5bac4b..94512eb583 100644 --- a/engines/wintermute/base/gfx/osystem/render_ticket.cpp +++ b/engines/wintermute/base/gfx/osystem/render_ticket.cpp @@ -107,9 +107,9 @@ void RenderTicket::drawToSurface(Graphics::Surface *_targetSurface) const { if (_owner) { if (_transform._alphaDisable) { - src._alphaMode = TransparentSurface::ALPHA_OPAQUE; + src.setAlphaMode(TransparentSurface::ALPHA_OPAQUE); } else { - src._alphaMode = _owner->getAlphaType(); + src.setAlphaMode(_owner->getAlphaType()); } } src.blit(*_targetSurface, _dstRect.left, _dstRect.top, _transform._flip, &clipRect, _transform._rgbaMod, clipRect.width(), clipRect.height()); @@ -127,9 +127,9 @@ void RenderTicket::drawToSurface(Graphics::Surface *_targetSurface, Common::Rect if (_owner) { if (_transform._alphaDisable) { - src._alphaMode = TransparentSurface::ALPHA_OPAQUE; + src.setAlphaMode(TransparentSurface::ALPHA_OPAQUE); } else { - src._alphaMode = _owner->getAlphaType(); + src.setAlphaMode(_owner->getAlphaType()); } } src.blit(*_targetSurface, dstRect->left, dstRect->top, _transform._flip, clipRect, _transform._rgbaMod, clipRect->width(), clipRect->height(), _transform._blendMode); |