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

[thebluegr at users.sourceforge.net]

Revision: 51298
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51298&view=rev
Author:   thebluegr
Date:     2010-07-26 06:30:15 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: Fixed bug #3034490 , "signature mismatch in laura bow 2 introduction"

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 06:19:57 UTC (rev 51297)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 06:30:15 UTC (rev 51298)
@@ -379,7 +379,7 @@
     { MAP_CALL(LocalToGlobal),     SIG_EVERYWHERE,           "o",                     NULL,            NULL },
     { MAP_CALL(Lock),              SIG_EVERYWHERE,           "ii(i)",                 NULL,            NULL },
     { MAP_CALL(MapKeyToDir),       SIG_EVERYWHERE,           "o",                     NULL,            NULL },
-    { MAP_CALL(Memory),            SIG_EVERYWHERE,           "i(.*)",                 NULL,            NULL }, // subop
+    { MAP_CALL(Memory),            SIG_EVERYWHERE,           "i(.*)",                 NULL,            kMemory_workarounds }, // subop
     { MAP_CALL(MemoryInfo),        SIG_EVERYWHERE,           "i",                     NULL,            NULL },
     { MAP_CALL(MemorySegment),     SIG_EVERYWHERE,           "ir(i)",                 NULL,            NULL }, // subop
     { MAP_CALL(MenuSelect),        SIG_EVERYWHERE,           "o(i)",                  NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 06:19:57 UTC (rev 51297)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 06:30:15 UTC (rev 51298)
@@ -179,6 +179,14 @@
 };
 
 //    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
+	// TODO
+	//{ GID_LAURABOW2,     220,   999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,    0 } }, // during the intro, when talking to Mr. Augustini
+    SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kSetPort_workarounds[] = {
     { GID_LSL6,          740,   740,  0,              "rm740", "drawPic",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // ending scene, is called with additional 3 (!) parameters
     SCI_WORKAROUNDENTRY_TERMINATOR

Modified: scummvm/trunk/engines/sci/engine/workarounds.h
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 06:19:57 UTC (rev 51297)
+++ scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 06:30:15 UTC (rev 51298)
@@ -82,6 +82,7 @@
 extern const SciWorkaroundEntry kGraphFillBoxForeground_workarounds[];
 extern const SciWorkaroundEntry kGraphFillBoxAny_workarounds[];
 extern const SciWorkaroundEntry kGraphRedrawBox_workarounds[];
+extern const SciWorkaroundEntry kMemory_workarounds[];
 extern const SciWorkaroundEntry kSetPort_workarounds[];
 extern const SciWorkaroundEntry kUnLoad_workarounds[];
 extern const SciWorkaroundEntry kStrCpy_workarounds[];


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