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

[thebluegr at users.sourceforge.net]

Revision: 51305
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51305&view=rev
Author:   thebluegr
Date:     2010-07-26 09:16:57 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: Fixed bug #3034519, "GK1 Demo: kIsObject Sig Mismatch". 

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel_tables.h
    scummvm/trunk/engines/sci/engine/workarounds.cpp
    scummvm/trunk/engines/sci/engine/workarounds.h

Modified: scummvm/trunk/engines/sci/engine/kernel_tables.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 08:21:43 UTC (rev 51304)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 09:16:57 UTC (rev 51305)
@@ -373,7 +373,7 @@
     { MAP_CALL(InitBresen),        SIG_EVERYWHERE,           "o(i)",                  NULL,            NULL },
     { MAP_CALL(Intersections),     SIG_EVERYWHERE,           "iiiiriiiri",            NULL,            NULL },
     { MAP_CALL(IsItSkip),          SIG_EVERYWHERE,           "iiiii",                 NULL,            NULL },
-    { MAP_CALL(IsObject),          SIG_EVERYWHERE,           ".",                     NULL,            NULL },
+    { MAP_CALL(IsObject),          SIG_EVERYWHERE,           ".",                     NULL,            kIsObject_workarounds },
     { MAP_CALL(Joystick),          SIG_EVERYWHERE,           "i(.*)",                 NULL,            NULL }, // subop
     { MAP_CALL(LastNode),          SIG_EVERYWHERE,           "l",                     NULL,            NULL },
     { MAP_CALL(Load),              SIG_EVERYWHERE,           "ii(i*)",                NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 08:21:43 UTC (rev 51304)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 09:16:57 UTC (rev 51305)
@@ -185,6 +185,12 @@
 };
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+const SciWorkaroundEntry kIsObject_workarounds[] = {
+	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",  -1,    0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error")
+    SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kMemory_workarounds[] = {
     { GID_LAURABOW2,     160,   999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,    0 } }, // during the intro, when exiting the train
 	{ GID_LAURABOW2,     220,   999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,    0 } }, // during the intro, when talking to Mr. Augustini

Modified: scummvm/trunk/engines/sci/engine/workarounds.h
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 08:21:43 UTC (rev 51304)
+++ scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 09:16:57 UTC (rev 51305)
@@ -83,6 +83,7 @@
 extern const SciWorkaroundEntry kGraphFillBoxForeground_workarounds[];
 extern const SciWorkaroundEntry kGraphFillBoxAny_workarounds[];
 extern const SciWorkaroundEntry kGraphRedrawBox_workarounds[];
+extern const SciWorkaroundEntry kIsObject_workarounds[];
 extern const SciWorkaroundEntry kMemory_workarounds[];
 extern const SciWorkaroundEntry kPaletteUnsetFlag_workarounds[];
 extern const SciWorkaroundEntry kSetPort_workarounds[];


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