Fixed display of location background when changing from a scrollable to a non-scrollable one.

svn-id: r35522

2 files changed, 4 insertions, 4 deletions

diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index c30eb837bf..83570013fa 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -817,7 +817,7 @@ void Gfx::setBackground(uint type, BackgroundInfo *info) {
 	}
 
 	_minScroll = 0;
-	_maxScroll = _backgroundInfo->width - _vm->_screenWidth;
+	_maxScroll = MAX(0, _backgroundInfo->width - _vm->_screenWidth);
 }
 
 } // namespace Parallaction
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index cfadb9602e..5628c3c8c6 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -145,8 +145,9 @@ void Parallaction::updateView() {
 
 	#define SCROLL_BAND_WIDTH		120
 
+	int scrollX = 0;
 	if (canScroll()) {
-		int scrollX = _gfx->getScrollPos();
+		scrollX = _gfx->getScrollPos();
 
 		Common::Point foot;
 		_char.getFoot(foot);
@@ -163,9 +164,8 @@ void Parallaction::updateView() {
 		if (foot.x > max) {
 			scrollX += (foot.x - max);
 		}
-
-		_gfx->setScrollPos(scrollX);
 	}
+	_gfx->setScrollPos(scrollX);
 
 	_gfx->animatePalette();
 	_gfx->updateScreen();