diff options
| author | Tobia Tesan | 2013-07-09 22:20:39 +0200 |
|---|---|---|
| committer | Tobia Tesan | 2013-08-01 00:03:48 +0200 |
| commit | 1b9967400dbf28fa34dde175fdb4ad88c39ea623 (patch) | |
| tree | 767b16568ec7fad485d0ed812c65a87e45f1f08a /engines/wintermute/base/base_sub_frame.cpp | |
| parent | b6ed5ee816e7bb23e21acfaee56835e167c6025f (diff) | |
| download | scummvm-rg350-1b9967400dbf28fa34dde175fdb4ad88c39ea623.tar.gz scummvm-rg350-1b9967400dbf28fa34dde175fdb4ad88c39ea623.tar.bz2 scummvm-rg350-1b9967400dbf28fa34dde175fdb4ad88c39ea623.zip | |
WINTERMUTE: Use constants from transform_tools for consistency
Diffstat (limited to 'engines/wintermute/base/base_sub_frame.cpp')
| -rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index dbf46eae2e..0028de1908 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -48,8 +48,9 @@ IMPLEMENT_PERSISTENT(BaseSubFrame, false) ////////////////////////////////////////////////////////////////////////// BaseSubFrame::BaseSubFrame(BaseGame *inGame) : BaseScriptable(inGame, true) { _surface = nullptr; - _hotspotX = _hotspotY = 0; - _alpha = 0xFFFFFFFF; + _hotspotX = DEFAULT_HOTSPOT_X; + _hotspotY = DEFAULT_HOTSPOT_Y; + _alpha = DEFAULT_RGBAMOD; _transparent = 0xFFFF00FF; _wantsDefaultRect = false; @@ -246,7 +247,7 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl } if (registerOwner != nullptr && !_decoration) { - if (zoomX == 100 && zoomY == 100) { + if (zoomX == DEFAULT_ZOOM_X && zoomY == DEFAULT_ZOOM_Y) { BaseEngine::getRenderer()->addRectToList(new BaseActiveRect(_gameRef, registerOwner, this, x - _hotspotX + getRect().left, y - _hotspotY + getRect().top, getRect().right - getRect().left, getRect().bottom - getRect().top, zoomX, zoomY, precise)); } else { BaseEngine::getRenderer()->addRectToList(new BaseActiveRect(_gameRef, registerOwner, this, (int)(x - (_hotspotX + getRect().left) * (zoomX / 100)), (int)(y - (_hotspotY + getRect().top) * (zoomY / 100)), (int)((getRect().right - getRect().left) * (zoomX / 100)), (int)((getRect().bottom - getRect().top) * (zoomY / 100)), zoomX, zoomY, precise)); @@ -259,11 +260,11 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl bool res; //if (Alpha==0xFFFFFFFF) Alpha = _alpha; // TODO: better (combine owner's and self alpha) - if (_alpha != 0xFFFFFFFF) { + if (_alpha != DEFAULT_RGBAMOD) { alpha = _alpha; } - if (rotate != 0.0f) { + if (rotate != DEFAULT_ANGLE) { Point32 boxOffset, rotatedHotspot, hotspotOffset, newOrigin; Point32 origin(x, y); Rect32 oldRect = getRect(); @@ -273,10 +274,10 @@ bool BaseSubFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, fl newOrigin = origin - newHotspot; res = _surface->displayTransform(newOrigin.x, newOrigin.y, oldRect, newRect, transform); } else { - if (zoomX == 100 && zoomY == 100) { + if (zoomX == DEFAULT_ZOOM_X && zoomY == DEFAULT_ZOOM_Y) { res = _surface->displayTrans(x - _hotspotX, y - _hotspotY, getRect(), alpha, blendMode, _mirrorX, _mirrorY); } else { - res = _surface->displayTransZoom((int)(x - _hotspotX * (zoomX / 100)), (int)(y - _hotspotY * (zoomY / 100)), getRect(), zoomX, zoomY, alpha, blendMode, _mirrorX, _mirrorY); + res = _surface->displayTransZoom((int)(x - _hotspotX * (zoomX / DEFAULT_ZOOM_X)), (int)(y - _hotspotY * (zoomY / DEFAULT_ZOOM_Y)), getRect(), zoomX, zoomY, alpha, blendMode, _mirrorX, _mirrorY); } } |