diff options
| author | Tobia Tesan | 2013-07-09 21:02:55 +0200 |
|---|---|---|
| committer | Tobia Tesan | 2013-08-01 00:03:47 +0200 |
| commit | 285ed18979a470c458654f9f0c42ca02aa927f80 (patch) | |
| tree | 4838feb56c4a113caf4bca4b69d6d8abd006cca6 | |
| parent | b34d7b753912af6dd971872cd702d489974606ff (diff) | |
| download | scummvm-rg350-285ed18979a470c458654f9f0c42ca02aa927f80.tar.gz scummvm-rg350-285ed18979a470c458654f9f0c42ca02aa927f80.tar.bz2 scummvm-rg350-285ed18979a470c458654f9f0c42ca02aa927f80.zip | |
WINTERMUTE: Rename rotate() -> rotoscale() for consistency
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/render_ticket.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/graphics/transparent_surface.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/graphics/transparent_surface.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp index 8ea4f18605..2049d3ec57 100644 --- a/engines/wintermute/base/gfx/osystem/render_ticket.cpp +++ b/engines/wintermute/base/gfx/osystem/render_ticket.cpp @@ -53,7 +53,7 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s // Then scale it if necessary if (_transform._angle != 0) { TransparentSurface src(*_surface, false); - Graphics::Surface *temp = src.rotate(&transform); + Graphics::Surface *temp = src.rotoscale(&transform); _surface->free(); delete _surface; _surface = temp; diff --git a/engines/wintermute/graphics/transparent_surface.cpp b/engines/wintermute/graphics/transparent_surface.cpp index 1139b08199..07c2537d0f 100644 --- a/engines/wintermute/graphics/transparent_surface.cpp +++ b/engines/wintermute/graphics/transparent_surface.cpp @@ -496,9 +496,10 @@ Common::Rect TransparentSurface::blit(Graphics::Surface &target, int posX, int p return retSize; } -TransparentSurface *TransparentSurface::rotate(TransformStruct *transform) const { +TransparentSurface *TransparentSurface::rotoscale(TransformStruct *transform) const { assert (transform); + assert (transform->_angle != 0); // This would not be ideal Point32 newHotspot; Common::Rect srcRect(0, 0, (int16)w, (int16)h); diff --git a/engines/wintermute/graphics/transparent_surface.h b/engines/wintermute/graphics/transparent_surface.h index c01b10d96f..2798323379 100644 --- a/engines/wintermute/graphics/transparent_surface.h +++ b/engines/wintermute/graphics/transparent_surface.h @@ -111,7 +111,7 @@ struct TransparentSurface : public Graphics::Surface { void applyColorKey(uint8 r, uint8 g, uint8 b, bool overwriteAlpha = false); TransparentSurface *scale (uint16 newWidth, uint16 newHeight) const; - TransparentSurface *rotate(TransformStruct *transform) const; + TransparentSurface *rotoscale (TransformStruct *transform) const; static byte *_lookup; static void destroyLookup(); private: |