diff options
| author | Lars Persson | 2008-01-29 21:19:45 +0000 |
|---|---|---|
| committer | Lars Persson | 2008-01-29 21:19:45 +0000 |
| commit | ec0804eb23ebb2228ec439c56dbcfa49b4811b98 (patch) | |
| tree | dd68ac662f0502c02ac171a01a7db369ef533e68 /engines/gob/util.cpp | |
| parent | 04dda324851d6415ab7ad59d83110387fa130ae2 (diff) | |
| download | scummvm-rg350-ec0804eb23ebb2228ec439c56dbcfa49b4811b98.tar.gz scummvm-rg350-ec0804eb23ebb2228ec439c56dbcfa49b4811b98.tar.bz2 scummvm-rg350-ec0804eb23ebb2228ec439c56dbcfa49b4811b98.zip | |
- 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
Diffstat (limited to 'engines/gob/util.cpp')
| -rw-r--r-- | engines/gob/util.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
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(); } |