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

[drmccoy at users.sourceforge.net]

Revision: 26541
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26541&view=rev
Author:   drmccoy
Date:     2007-04-17 02:40:10 -0700 (Tue, 17 Apr 2007)

Log Message:
-----------
Fix scroll handler

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

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2007-04-17 07:19:23 UTC (rev 26540)
+++ scummvm/trunk/engines/gob/game.cpp	2007-04-17 09:40:10 UTC (rev 26541)
@@ -78,6 +78,7 @@
 	_forceHandleMouse = 0;
 	_menuLevel = 0;
 	_noScroll = true;
+	_scrollHandleMouse = false;
 
 	_tempStr[0] = 0;
 	_curImaFile[0] = 0;
@@ -290,7 +291,7 @@
 }
 
 void Game::evaluateScroll(int16 x, int16 y) {
-	if ((_handleMouse == 0) || (_menuLevel > 0))
+	if (!_scrollHandleMouse || (_menuLevel > 0))
 		return;
 
 	if (_noScroll || (_vm->_global->_videoMode != 0x14))

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2007-04-17 07:19:23 UTC (rev 26540)
+++ scummvm/trunk/engines/gob/game.h	2007-04-17 09:40:10 UTC (rev 26541)
@@ -129,6 +129,7 @@
 	int16 _mouseButtons;
 
 	bool _noScroll;
+	bool _scrollHandleMouse;
 
 	Game(GobEngine *vm);
 	virtual ~Game();

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2007-04-17 07:19:23 UTC (rev 26540)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2007-04-17 09:40:10 UTC (rev 26541)
@@ -407,7 +407,7 @@
 	int16 newkey;
 	uint32 timeKey;
 
-	_handleMouse = handleMouse;
+	_scrollHandleMouse = handleMouse != 0;
 
 	if (deltaTime >= -1) {
 		_lastCollKey = 0;


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