[Scummvm-cvs-logs] SF.net SVN: scummvm: [22056] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22056
Author:   kirben
Date:     2006-04-20 04:57:23 -0700 (Thu, 20 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22056&view=rev

Log Message:
-----------
Fix constant scrolling in oracle in FF, when mouse button is pressed

Modified Paths:
--------------
    scummvm/trunk/engines/simon/oracle.cpp
    scummvm/trunk/engines/simon/verb.cpp
Modified: scummvm/trunk/engines/simon/oracle.cpp
===================================================================
--- scummvm/trunk/engines/simon/oracle.cpp	2006-04-20 10:45:51 UTC (rev 22055)
+++ scummvm/trunk/engines/simon/oracle.cpp	2006-04-20 11:57:23 UTC (rev 22056)
@@ -93,7 +93,6 @@
 
 	if (_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
 		_oracleMaxScrollY = _textWindow->scrollY;
-
 	while(1) {
 		if (_textWindow->scrollY == _oracleMaxScrollY)
 			break;
@@ -115,8 +114,9 @@
 			setBitFlag(94, false);
 			bltOracleText();
 		}
-		if (_currentBoxNumber != 601 || !_leftButtonDown)
+		if (_currentBoxNumber != 601 || !getBitFlag(89))
 			break;
+		delay(100);
 	}
 }
 
@@ -128,10 +128,10 @@
 
 	if (_textWindow->scrollY > _oracleMaxScrollY) 		// For scroll up
 		_oracleMaxScrollY = _textWindow->scrollY;
-
 	while(1) {
 		if (_textWindow->scrollY == 0)
 			break;
+
 		for (i = 0; i < 5; i++) {
 			_newLines = 0;
 			_textWindow->textColumn = 0;
@@ -149,8 +149,9 @@
 			setBitFlag(93, false);
 			bltOracleText();
 		}
-		if (_currentBoxNumber != 600 || !_leftButtonDown)
+		if (_currentBoxNumber != 600 || !getBitFlag(89))
 			break;
+		delay(100);
 	}
 }
 

Modified: scummvm/trunk/engines/simon/verb.cpp
===================================================================
--- scummvm/trunk/engines/simon/verb.cpp	2006-04-20 10:45:51 UTC (rev 22055)
+++ scummvm/trunk/engines/simon/verb.cpp	2006-04-20 11:57:23 UTC (rev 22056)
@@ -591,10 +591,10 @@
 		checkUp(window);
 		loadSprite(4, 9, 21, 0 ,0, 0);	
 		while(1) {
-			if (_currentBoxNumber != 0x7FFB || !_leftButtonDown)
+			if (_currentBoxNumber != 0x7FFB || !getBitFlag(89))
 				break;
 			checkUp(window);
-			delay(1);
+			delay(100);
 		}
 		waitForMark(2);
 		checkUp(window);
@@ -618,10 +618,10 @@
 		checkDown(window);
 		loadSprite(4, 9, 23, 0, 0, 0);	
 		while(1) {
-			if (_currentBoxNumber != 0x7FFC || !_leftButtonDown)
+			if (_currentBoxNumber != 0x7FFC || !getBitFlag(89))
 				break;
 			checkDown(window);
-			delay(1);
+			delay(100);
 		}
 		waitForMark(2);
 		checkDown(window);


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