[Scummvm-cvs-logs] SF.net SVN: scummvm:[50534] scummvm/trunk/engines/sci/engine/kernel.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Wed Jun 30 16:39:03 CEST 2010
Revision: 50534
http://scummvm.svn.sourceforge.net/scummvm/?rev=50534&view=rev
Author: m_kiewitz
Date: 2010-06-30 14:39:03 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
SCI: removing sq1 workaround for kUnLoad for now, maybe it was originally meant for calling kUnLoad with just 1 argument
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.cpp
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2010-06-30 14:26:47 UTC (rev 50533)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2010-06-30 14:39:03 UTC (rev 50534)
@@ -207,12 +207,6 @@
// .* -> any parameters afterwards (or none)
// gameID, scriptNr,lvl, object-name, method-name, call,index,replace
-static const SciWorkaroundEntry kUnLoad_workarounds[] = {
- { GID_SQ1, 998, 0, "View", "delete", -1, 0, { 1, 0 } }, // exiting ulence flats bar - slotGuyBody::dispose calls view::delete resulting in parameter 1 to be a reference
- SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-// gameID, scriptNr,lvl, object-name, method-name, call,index,replace
static const SciWorkaroundEntry kDisposeScript_workarounds[] = {
{ GID_QFG1, 64, 0, "rm64", "dispose", -1, 0, { 1, 0 } }, // parameter 0 is an object when leaving graveyard
SCI_WORKAROUNDENTRY_TERMINATOR
@@ -252,7 +246,8 @@
// name, version/platform, signature, sub-signatures, workarounds
static SciKernelMapEntry s_kernelMap[] = {
{ MAP_CALL(Load), SIG_EVERYWHERE, "iii*", NULL, NULL },
- { MAP_CALL(UnLoad), SIG_EVERYWHERE, "iRi*", NULL, kUnLoad_workarounds },
+ { MAP_CALL(UnLoad), SIG_EVERYWHERE, "iRi*", NULL, NULL },
+ // ^^ - in SQ1 when leaving ulence flats bar, kUnLoad is called with just one argument (FIXME?)
{ MAP_CALL(ScriptID), SIG_EVERYWHERE, "Ioi*", NULL, NULL },
{ MAP_CALL(DisposeScript), SIG_EVERYWHERE, "ii*", NULL, kDisposeScript_workarounds },
{ MAP_CALL(Clone), SIG_EVERYWHERE, "o", NULL, NULL },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list