From 2ad40edd47098144cecb808cf308bca8329479ff Mon Sep 17 00:00:00 2001 From: richiesams Date: Sat, 31 Aug 2013 18:10:58 -0500 Subject: [PATCH] ZVISION: Limit tilt movement to the size of the image // TODO: Remove image wrapping logic for the vertical direction since this can never happen now --- engines/zvision/render_manager.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp index 96030ba2b98..ea34469baf5 100644 --- a/engines/zvision/render_manager.cpp +++ b/engines/zvision/render_manager.cpp @@ -324,15 +324,7 @@ void RenderManager::moveBackground(int offset) { if (state == RenderTable::TILT) { _backgroundOffset += Common::Point(0, offset); - if (_backgroundOffset.x <= -_backgroundWidth) - _backgroundOffset.x += _backgroundWidth; - else if (_backgroundOffset.x >= _backgroundWidth) - _backgroundOffset.x -= _backgroundWidth; - - if (_backgroundOffset.y <= -_backgroundHeight) - _backgroundOffset.y += _backgroundHeight; - else if (_backgroundOffset.y >= _backgroundHeight) - _backgroundOffset.y -= _backgroundHeight; + _backgroundOffset.y = CLIP(_backgroundOffset.y, _screenCenterY, (int16)_backgroundHeight - _screenCenterY); renderImageToScreen(_currentBackground, 0, _screenCenterY - _backgroundOffset.y, true); } else if (state == RenderTable::PANORAMA) { @@ -343,11 +335,6 @@ void RenderManager::moveBackground(int offset) { else if (_backgroundOffset.x >= _backgroundWidth) _backgroundOffset.x -= _backgroundWidth; - if (_backgroundOffset.y <= -_backgroundHeight) - _backgroundOffset.y += _backgroundHeight; - else if (_backgroundOffset.y >= _backgroundHeight) - _backgroundOffset.y -= _backgroundHeight; - renderImageToScreen(_currentBackground, _screenCenterX - _backgroundOffset.x, 0, true); } else { renderImageToScreen(_currentBackground, 0, 0);