[Scummvm-cvs-logs] SF.net SVN: scummvm: [25051] scummvm/trunk/engines/scumm

[cyx at users.sourceforge.net]

Revision: 25051
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25051&view=rev
Author:   cyx
Date:     2007-01-07 15:18:18 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
possible fix for bug #1193185

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp
    scummvm/trunk/engines/scumm/verbs.cpp

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2007-01-07 22:27:57 UTC (rev 25050)
+++ scummvm/trunk/engines/scumm/input.cpp	2007-01-07 23:18:18 UTC (rev 25051)
@@ -172,14 +172,14 @@
 		// The following two cases enable dialog choices to be
 		// scrolled through in the SegaCD version of MI
 		// as nothing else uses the wheel don't bother
-		// checking the gameid
+		// checking the gameid. Values are taken from script-14.
 
 		case OSystem::EVENT_WHEELDOWN:
-			_keyPressed = 'a';
+			_keyPressed = 55;
 			break;
 
 		case OSystem::EVENT_WHEELUP:
-			_keyPressed = 'q';
+			_keyPressed = 54;
 			break;
 
 		case OSystem::EVENT_QUIT:

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2007-01-07 22:27:57 UTC (rev 25050)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2007-01-07 23:18:18 UTC (rev 25051)
@@ -485,13 +485,18 @@
 
 	if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
 		/* Check keypresses */
-		vs = &_verbs[1];
-		for (i = 1; i < _numVerbs; i++, vs++) {
-			if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) {
-				if (_mouseAndKeyboardStat == vs->key) {
-					// Trigger verb as if the user clicked it
-					runInputScript(1, vs->verbid, 1);
-					return;
+		if (!(_game.id == GID_MONKEY && _game.platform == Common::kPlatformSegaCD)) {
+			// This is disabled in the SegaCD version as the "vs->key" values setup
+			// by script-17 conflict with the values expected by the generic keyboard
+			// input script
+			vs = &_verbs[1];
+			for (i = 1; i < _numVerbs; i++, vs++) {
+				if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) {
+					if (_mouseAndKeyboardStat == vs->key) {
+						// Trigger verb as if the user clicked it
+						runInputScript(1, vs->verbid, 1);
+						return;
+					}
 				}
 			}
 		}
@@ -623,7 +628,7 @@
 		if (_verbs[_verbMouseOver].type != kImageVerbType) {
 			drawVerb(_verbMouseOver, 0);
 		}
-	
+
 		if (_verbs[verb].type != kImageVerbType && _verbs[verb].hicolor) {
 			drawVerb(verb, 1);
 			_verbMouseOver = verb;


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