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

[m_kiewitz at users.sourceforge.net]

Revision: 51059
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51059&view=rev
Author:   m_kiewitz
Date:     2010-07-20 11:29:56 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
SCI: added workaround for kq1 kDoSound(fade)

gets called with object 0:0 in several scenes, just ignore that call

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-07-20 11:17:33 UTC (rev 51058)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-20 11:29:56 UTC (rev 51059)
@@ -237,6 +237,7 @@
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call, index,   replace
 static const SciWorkaroundEntry kDoSoundFade_workarounds[] = {
+    { GID_KQ1,            -1,   989,  0,          "gameSound", "fade",           -1,    0, { 1,    0 } }, // gets called in several scenes (e.g. graham cracker) with 0:0
     { GID_KQ6,           105,   989,  0,        "globalSound", "fade",           -1,    0, { 0,    0 } }, // floppy: during intro, parameter 4 is an object
     SCI_WORKAROUNDENTRY_TERMINATOR
 };
@@ -340,7 +341,7 @@
     { SIG_SOUNDSCI0,       7, MAP_CALL(DoSoundResumeAfterRestore), "",                     NULL },
     { SIG_SOUNDSCI0,       8, MAP_CALL(DoSoundMasterVolume),       "(i)",                  NULL },
     { SIG_SOUNDSCI0,       9, MAP_CALL(DoSoundUpdate),             "o",                    NULL },
-    { SIG_SOUNDSCI0,      10, MAP_CALL(DoSoundFade),               "o",                    NULL },
+    { SIG_SOUNDSCI0,      10, MAP_CALL(DoSoundFade),               "o",                    kDoSoundFade_workarounds },
     { SIG_SOUNDSCI0,      11, MAP_CALL(DoSoundGetPolyphony),       "",                     NULL },
     { SIG_SOUNDSCI0,      12, MAP_CALL(DoSoundStopAll),            "",                     NULL },
     { SIG_SOUNDSCI1EARLY,  0, MAP_CALL(DoSoundMasterVolume),       NULL,                   NULL },


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