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

[thebluegr at users.sourceforge.net]

Revision: 55217
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55217&view=rev
Author:   thebluegr
Date:     2011-01-12 23:33:30 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
SCI: Added a workaround for script bug #3156472 - "King's Quest 5 cdrom version crash on escape"

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	2011-01-12 23:30:59 UTC (rev 55216)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2011-01-12 23:33:30 UTC (rev 55217)
@@ -385,7 +385,7 @@
 	{ MAP_CALL(MenuSelect),        SIG_EVERYWHERE,           "o(i)",                  NULL,            NULL },
 	{ MAP_CALL(MergePoly),         SIG_EVERYWHERE,           "rli",                   NULL,            NULL },
 	{ MAP_CALL(Message),           SIG_EVERYWHERE,           "i(.*)",                 NULL,            NULL }, // subop
-	{ MAP_CALL(MoveCursor),        SIG_EVERYWHERE,           "ii",                    NULL,            NULL },
+	{ MAP_CALL(MoveCursor),        SIG_EVERYWHERE,           "ii",                    NULL,            kMoveCursor_workarounds },
 	{ MAP_CALL(NewList),           SIG_EVERYWHERE,           "",                      NULL,            NULL },
 	{ MAP_CALL(NewNode),           SIG_EVERYWHERE,           "..",                    NULL,            NULL },
 	{ MAP_CALL(NewWindow),         SIG_SCIALL, SIGFOR_MAC,   ".*",                    NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2011-01-12 23:30:59 UTC (rev 55216)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2011-01-12 23:33:30 UTC (rev 55217)
@@ -382,6 +382,12 @@
 };
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+const SciWorkaroundEntry kMoveCursor_workarounds[] = {
+	{ GID_KQ5,            -1,   937,  0,            "IconBar", "handleEvent",    -1,    0, { WORKAROUND_IGNORE,  0 } }, // when pressing escape to open the menu, gets called with one parameter instead of 2 - bug #3156472
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kNewWindow_workarounds[] = {
 	{ GID_ECOQUEST,       -1,   981,  0,          "SysWindow", "open",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // EcoQuest 1 demo uses an in-between interpreter from SCI1 to SCI1.1. It's SCI1.1, but uses the SCI1 semantics for this call - bug #3035057
 	SCI_WORKAROUNDENTRY_TERMINATOR

Modified: scummvm/trunk/engines/sci/engine/workarounds.h
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.h	2011-01-12 23:30:59 UTC (rev 55216)
+++ scummvm/trunk/engines/sci/engine/workarounds.h	2011-01-12 23:33:30 UTC (rev 55217)
@@ -98,6 +98,7 @@
 extern const SciWorkaroundEntry kGraphRedrawBox_workarounds[];
 extern const SciWorkaroundEntry kIsObject_workarounds[];
 extern const SciWorkaroundEntry kMemory_workarounds[];
+extern const SciWorkaroundEntry kMoveCursor_workarounds[];
 extern const SciWorkaroundEntry kNewWindow_workarounds[];
 extern const SciWorkaroundEntry kPaletteUnsetFlag_workarounds[];
 extern const SciWorkaroundEntry kSetCursor_workarounds[];


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