diff options
author | Tobia Tesan | 2013-07-09 20:57:03 +0200 |
---|---|---|
committer | Tobia Tesan | 2013-08-01 00:03:46 +0200 |
commit | b34d7b753912af6dd971872cd702d489974606ff (patch) | |
tree | 621c07f2ce02c9be03a9d1787398314b5a1621bb /engines/wintermute/base | |
parent | 0b21d6dca2ad5be41fa2aa4c2bed2cb694fba4d1 (diff) | |
download | scummvm-rg350-b34d7b753912af6dd971872cd702d489974606ff.tar.gz scummvm-rg350-b34d7b753912af6dd971872cd702d489974606ff.tar.bz2 scummvm-rg350-b34d7b753912af6dd971872cd702d489974606ff.zip |
WINTERMUTE: *transform as pointer in transform_tools
Diffstat (limited to 'engines/wintermute/base')
-rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/osystem/render_ticket.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index eb1c859c2f..dbf46eae2e 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -269,7 +269,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl Rect32 oldRect = getRect(); Point32 newHotspot; TransformStruct transform = TransformStruct(zoomX, zoomY, rotate, _hotspotX, _hotspotY, blendMode, alpha, _mirrorX, _mirrorY, 0, 0); - Rect32 newRect = TransformTools::newRect (oldRect, transform, &newHotspot); + Rect32 newRect = TransformTools::newRect (oldRect, &transform, &newHotspot); newOrigin = origin - newHotspot; res = _surface->displayTransform(newOrigin.x, newOrigin.y, oldRect, newRect, transform); } else { diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp index 3f94c2e500..8ea4f18605 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.rotate(&transform); _surface->free(); delete _surface; _surface = temp; @@ -70,7 +70,7 @@ RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *s if (transform._angle != 0) { // Make sure comparison-tickets get the correct width Rect32 dstRect; Point32 newHotspot; - dstRect = TransformTools::newRect(_srcRect, transform, &newHotspot); + dstRect = TransformTools::newRect(_srcRect, &transform, &newHotspot); _dstRect.setWidth(dstRect.right-dstRect.left); _dstRect.setHeight(dstRect.bottom-dstRect.top); } |