From ec0804eb23ebb2228ec439c56dbcfa49b4811b98 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Tue, 29 Jan 2008 21:19:45 +0000
Subject: - Updated default char signing to signed (as per PC) in makefiles -
 Fix for Symbian scrolling problem in GOB3, expressions not evaluated properly
 resulting in offset beeing set to -1 and not the right offset.

svn-id: r30703
---
 engines/gob/util.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'engines/gob/util.cpp')

diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 8166101346..93ec42c7ac 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -324,8 +324,17 @@ void Util::waitEndFrame() {
 
 void Util::setScrollOffset(int16 x, int16 y) {
 	processInput();
-	_vm->_video->_scrollOffsetX = x >= 0 ? x : _vm->_draw->_scrollOffsetX;
-	_vm->_video->_scrollOffsetY = y >= 0 ? y : _vm->_draw->_scrollOffsetY;
+
+	if(x >= 0)
+		_vm->_video->_scrollOffsetX = x; 
+	else
+		_vm->_video->_scrollOffsetX = _vm->_draw->_scrollOffsetX;
+
+	if(y >= 0)
+		_vm->_video->_scrollOffsetY = y; 
+	else
+		_vm->_video->_scrollOffsetY = _vm->_draw->_scrollOffsetY;
+
 	_vm->_video->waitRetrace();
 }
 
-- 
cgit v1.2.3