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

[m_kiewitz at users.sourceforge.net]

Revision: 51165
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51165&view=rev
Author:   m_kiewitz
Date:     2010-07-22 21:06:45 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
SCI: fix signature of kStrCpy

disabled workaround for island of dr. brain, seems to work w/o and was probably caused by bad signature

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

Modified: scummvm/trunk/engines/sci/engine/kernel_tables.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-22 20:38:28 UTC (rev 51164)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-22 21:06:45 UTC (rev 51165)
@@ -430,7 +430,7 @@
     { MAP_CALL(StrAt),             SIG_EVERYWHERE,           "ri(i)",                 NULL,            NULL },
     { MAP_CALL(StrCat),            SIG_EVERYWHERE,           "rr",                    NULL,            NULL },
     { MAP_CALL(StrCmp),            SIG_EVERYWHERE,           "rr(i)",                 NULL,            NULL },
-    { MAP_CALL(StrCpy),            SIG_EVERYWHERE,           "[r0]r(i)",              NULL,            kStrCpy_workarounds },
+    { MAP_CALL(StrCpy),            SIG_EVERYWHERE,           "r[r0](i)",              NULL,            kStrCpy_workarounds },
     { MAP_CALL(StrEnd),            SIG_EVERYWHERE,           "r",                     NULL,            NULL },
     { MAP_CALL(StrLen),            SIG_EVERYWHERE,           "[r0]",                  NULL,            NULL },
     { MAP_CALL(StrSplit),          SIG_EVERYWHERE,           "rr[r0]",                NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-22 20:38:28 UTC (rev 51164)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-22 21:06:45 UTC (rev 51165)
@@ -164,7 +164,8 @@
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kStrCpy_workarounds[] = {
-    { GID_ISLANDBRAIN,   260,    45,  0,        "aWord", "addOn",                -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Hominy Homonym puzzle
+	// seems not to be needed, because the signature was wrong
+    //{ GID_ISLANDBRAIN,   260,    45,  0,        "aWord", "addOn",                -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Hominy Homonym puzzle
     SCI_WORKAROUNDENTRY_TERMINATOR
 };
 


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