[Scummvm-cvs-logs] SF.net SVN: scummvm:[50978] scummvm/trunk/engines/sci/engine/vm.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50978
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50978&view=rev
Author:   m_kiewitz
Date:     2010-07-18 04:56:16 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
SCI: added uninitialized workarounds for hoyle 3

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-18 04:25:57 UTC (rev 50977)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-18 04:56:16 UTC (rev 50978)
@@ -314,7 +314,8 @@
 				if (workaround->gameId == gameId && workaround->scriptNr == curScriptNr
 						&& ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel))
 						&& (workaround->objectName == searchObjectName)
-						&& workaround->methodName == curMethodName && workaround->localCallOffset == lastCall->debugLocalCallOffset && workaround->index == index) {
+						&& workaround->methodName == curMethodName && workaround->localCallOffset == lastCall->debugLocalCallOffset
+						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
 					return workaround->newValue;
 				}
@@ -366,6 +367,9 @@
     { GID_FREDDYPHARKAS,  31,  0,            "quitWin", "open",           -1,    5, { 0, 0xf } }, // is used as priority for game menu
     { GID_GK1,         64950,  1,            "Feature", "handleEvent",    -1,    0, { 0,   0 } }, // sometimes when walk-clicking
     { GID_GK2,            11,  0,                   "", "export 10",      -1,    3, { 0,   0 } }, // called when the game starts
+    { GID_HOYLE3,          0,  1,          "Character", "say",            -1,  504, { 0,   0 } }, // when starting checkers, first time a character says something
+    { GID_HOYLE3,          0,  1,          "Character", "say",            -1,  505, { 0,   0 } }, // when starting checkers, first time a character says something
+    { GID_HOYLE3,        700,  0,           "gcWindow", "open",           -1,   -1, { 0,   0 } }, // when entering control menu
     { GID_ISLANDBRAIN,   140,  0,              "piece", "init",           -1,    3, { 0,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
     { GID_ISLANDBRAIN,   268,  0,          "anElement", "select",         -1,    0, { 0,   0 } }, // elements puzzle, gets used before super TextIcon
     { GID_JONES,         232,  0,        "weekendText", "draw",        0x3d3,    0, { 0,   0 } }, // jones/cd only - gets called during the game


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