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

[drmccoy at users.sourceforge.net]

Revision: 26440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26440&view=rev
Author:   drmccoy
Date:     2007-04-09 11:29:51 -0700 (Mon, 09 Apr 2007)

Log Message:
-----------
Preventing scrolling while the menu is shown

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-09 18:00:22 UTC (rev 26439)
+++ scummvm/trunk/engines/gob/game.cpp	2007-04-09 18:29:51 UTC (rev 26440)
@@ -76,6 +76,7 @@
 	_activeCollIndex = 0;
 	_handleMouse = 0;
 	_forceHandleMouse = 0;
+	_menuLevel = 0;
 
 	_tempStr[0] = 0;
 	_curImaFile[0] = 0;

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2007-04-09 18:00:22 UTC (rev 26439)
+++ scummvm/trunk/engines/gob/game.h	2007-04-09 18:29:51 UTC (rev 26440)
@@ -170,6 +170,7 @@
 	int16 _activeCollIndex;
 	byte _handleMouse;
 	char _forceHandleMouse;
+	uint32 _menuLevel;
 
 	char _tempStr[256];
 

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2007-04-09 18:00:22 UTC (rev 26439)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2007-04-09 18:29:51 UTC (rev 26440)
@@ -277,7 +277,11 @@
 		_vm->_global->_inter_execPtr = _totFileData;
 		_vm->_global->_inter_execPtr +=
 			READ_LE_UINT16(_totFileData + (skipPlay << 1) + 0x66);
+
+		_menuLevel++;
 		_vm->_inter->callSub(2);
+		_menuLevel--;
+
 		if (_vm->_inter->_terminate != 0)
 			_vm->_inter->_terminate = 2;
 	}
@@ -444,7 +448,9 @@
 		key = checkKeys(&_vm->_global->_inter_mouseX,
 				&_vm->_global->_inter_mouseY, &_mouseButtons, handleMouse);
 
-		if ((_vm->_global->_videoMode == 0x14) && (handleMouse != 0)) {
+		if ((_vm->_global->_videoMode == 0x14) && (handleMouse != 0) &&
+				(_menuLevel == 0)) {
+
 			int16 cursorRight;
 			int16 screenRight;
 			


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