aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2008-05-13 23:22:31 +0000
committerSven Hesse2008-05-13 23:22:31 +0000
commitcfd1fa6973b65942b476ca8fb746a617cb5851c0 (patch)
tree51190d01e681cfeb83029ebaf2f394c82f95d740 /engines/gob/inter_v2.cpp
parent231ef79de22b0ca1836c33fd8d54b7b5cb9970e3 (diff)
downloadscummvm-rg350-cfd1fa6973b65942b476ca8fb746a617cb5851c0.tar.gz
scummvm-rg350-cfd1fa6973b65942b476ca8fb746a617cb5851c0.tar.bz2
scummvm-rg350-cfd1fa6973b65942b476ca8fb746a617cb5851c0.zip
Some fixes for vertical scrolling in Woodruff
svn-id: r32095
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r--engines/gob/inter_v2.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 6f261e9822..493efa8438 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -1444,19 +1444,22 @@ void Inter_v2::o2_initScreen() {
int16 screenHeight = _vm->_video->_surfHeight;
- _vm->_video->_surfHeight += offY;
+ if (screenHeight < _vm->_height) {
+ _vm->_video->_surfHeight += offY;
+ _vm->_video->_splitStart = screenHeight;
+ } else
+ _vm->_video->_splitStart = screenHeight - offY;
- _vm->_video->_splitHeight1 = MIN<int16>(_vm->_height, screenHeight - offY);
- _vm->_video->_splitHeight2 = offY;
- _vm->_video->_splitStart = screenHeight;
+ _vm->_video->_splitHeight1 = MIN<int16>(_vm->_height, screenHeight - offY);
+ _vm->_video->_splitHeight2 = offY;
- if ((_vm->_video->_surfHeight + offY) < _vm->_height)
- _vm->_video->_screenDeltaY = (_vm->_height - (screenHeight + offY)) / 2;
- else
- _vm->_video->_screenDeltaY = 0;
+ if ((_vm->_video->_surfHeight + offY) < _vm->_height)
+ _vm->_video->_screenDeltaY = (_vm->_height - (screenHeight + offY)) / 2;
+ else
+ _vm->_video->_screenDeltaY = 0;
- _vm->_global->_mouseMaxY = (screenHeight + _vm->_video->_screenDeltaY) - offY - 1;
- _vm->_global->_mouseMinY = _vm->_video->_screenDeltaY;
+ _vm->_global->_mouseMaxY = (screenHeight + _vm->_video->_screenDeltaY) - offY - 1;
+ _vm->_global->_mouseMinY = _vm->_video->_screenDeltaY;
} else {
_vm->_video->_splitHeight1 = MIN<int16>(_vm->_height, _vm->_video->_surfHeight - offY);