[Scummvm-cvs-logs] SF.net SVN: scummvm: [31855] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 31855
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31855&view=rev
Author:   drmccoy
Date:     2008-05-03 18:02:27 -0700 (Sat, 03 May 2008)

Log Message:
-----------
Enabled scrolling in Woodruff

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.cpp
    scummvm/trunk/engines/gob/util.cpp

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2008-05-03 23:51:24 UTC (rev 31854)
+++ scummvm/trunk/engines/gob/game.cpp	2008-05-04 01:02:27 UTC (rev 31855)
@@ -311,7 +311,8 @@
 	if (_preventScroll || !_scrollHandleMouse || (_menuLevel > 0))
 		return;
 
-	if (_noScroll || (_vm->_global->_videoMode != 0x14))
+	if (_noScroll ||
+	   ((_vm->_global->_videoMode != 0x14) && (_vm->_global->_videoMode != 0x18)))
 		return;
 
 	if ((x == 0) && (_vm->_draw->_scrollOffsetX > 0)) {

Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp	2008-05-03 23:51:24 UTC (rev 31854)
+++ scummvm/trunk/engines/gob/util.cpp	2008-05-04 01:02:27 UTC (rev 31855)
@@ -132,7 +132,10 @@
 		x = CLIP(x, _vm->_global->_mouseMinX, _vm->_global->_mouseMaxX);
 		y = CLIP(y, _vm->_global->_mouseMinY, _vm->_global->_mouseMaxY);
 
-		_vm->_util->setMousePos(x - _vm->_video->_screenDeltaX, y - _vm->_video->_screenDeltaY);
+		x -= _vm->_video->_screenDeltaX;
+		y -= _vm->_video->_screenDeltaY;
+
+		_vm->_util->setMousePos(x, y);
 		_vm->_game->evaluateScroll(x, y);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.