diff options
author | Colin Snover | 2017-11-12 13:43:42 -0600 |
---|---|---|
committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
commit | 88a2eaba93a454562b99bd59f797533b9f6b4848 (patch) | |
tree | fb3211337eab804ec349add0783193d42b52123f /engines/fullpipe/input.cpp | |
parent | 136223026ecb4569bbd425ed586eb7de42979c9f (diff) | |
download | scummvm-rg350-88a2eaba93a454562b99bd59f797533b9f6b4848.tar.gz scummvm-rg350-88a2eaba93a454562b99bd59f797533b9f6b4848.tar.bz2 scummvm-rg350-88a2eaba93a454562b99bd59f797533b9f6b4848.zip |
FULLPIPE: Make dimensions/coordinate getters pure functions
Diffstat (limited to 'engines/fullpipe/input.cpp')
-rw-r--r-- | engines/fullpipe/input.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp index 4bcc2acc17..0448c1b3c4 100644 --- a/engines/fullpipe/input.cpp +++ b/engines/fullpipe/input.cpp @@ -72,12 +72,10 @@ void setInputDisabled(bool state) { void InputController::addCursor(CursorInfo *cursor) { CursorInfo *newc = new CursorInfo(cursor); - Common::Point p; + const Dims dims = cursor->picture->getDimensions(); - cursor->picture->getDimensions(&p); - - newc->width = p.x; - newc->height = p.y; + newc->width = dims.x; + newc->height = dims.y; newc->picture->_x = -1; newc->picture->_y = -1; @@ -331,20 +329,18 @@ void FullpipeEngine::processArcade(ExCommand *cmd) { } void FullpipeEngine::setArcadeOverlay(int picId) { - Common::Point point; - Common::Point point2; - _arcadeOverlayX = 800; _arcadeOverlayY = 545; _arcadeOverlayHelper = accessScene(SC_INV)->getPictureObjectById(PIC_CSR_HELPERBGR, 0); _arcadeOverlay = accessScene(SC_INV)->getPictureObjectById(picId, 0); - _arcadeOverlay->getDimensions(&point); - _arcadeOverlayHelper->getDimensions(&point2); + const Dims dims = _arcadeOverlay->getDimensions(); + const Dims dims2 = _arcadeOverlayHelper->getDimensions(); - _arcadeOverlayMidX = (point2.x - point.x) / 2; - _arcadeOverlayMidY = abs(point2.y - point.y) / 2; + // TODO: Only Y gets abs? + _arcadeOverlayMidX = (dims2.x - dims.x) / 2; + _arcadeOverlayMidY = abs(dims2.y - dims.y) / 2; } int FullpipeEngine::drawArcadeOverlay(int adjust) { |