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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Wed Jul 14 13:34:46 CEST 2010


Revision: 50879
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50879&view=rev
Author:   m_kiewitz
Date:     2010-07-14 11:34:44 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
SCI: changing signature of kDoSound(play) in SCI2.1 to "o(i)" now, because qfg4 still uses "oi" calling

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp
    scummvm/trunk/engines/sci/resource_audio.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-14 11:29:55 UTC (rev 50878)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-14 11:34:44 UTC (rev 50879)
@@ -386,10 +386,12 @@
     { SIG_SOUNDSCI21,      5, MAP_CALL(DoSoundSuspend),            NULL,                   NULL },
     { SIG_SOUNDSCI21,      6, MAP_CALL(DoSoundInit),               NULL,                   NULL },
     { SIG_SOUNDSCI21,      7, MAP_CALL(DoSoundDispose),            NULL,                   NULL },
-    { SIG_SOUNDSCI21,      8, MAP_CALL(DoSoundPlay),               "o",                    NULL },
+    { SIG_SOUNDSCI21,      8, MAP_CALL(DoSoundPlay),               "o(i)",                 NULL },
     // ^^ TODO: if this is really the only change between SCI1LATE AND SCI21, we could rename the
     //     SIG_SOUNDSCI1LATE #define to SIG_SINCE_SOUNDSCI1LATE and make it being SCI1LATE+. Although
     //     I guess there are many more changes somewhere
+    // TODO: Quest for Glory 4 (SCI2.1) uses the old scheme, we need to detect it accordingly
+    //        signature for SCI21 should be "o"
     { SIG_SOUNDSCI21,      9, MAP_CALL(DoSoundStop),               NULL,                   NULL },
     { SIG_SOUNDSCI21,     10, MAP_CALL(DoSoundPause),              NULL,                   NULL },
     { SIG_SOUNDSCI21,     11, MAP_CALL(DoSoundFade),               NULL,                   NULL },

Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp	2010-07-14 11:29:55 UTC (rev 50878)
+++ scummvm/trunk/engines/sci/resource_audio.cpp	2010-07-14 11:34:44 UTC (rev 50879)
@@ -543,6 +543,7 @@
 
 	case SCI_VERSION_1_EARLY:
 	case SCI_VERSION_1_LATE:
+	case SCI_VERSION_2_1:
 		data = resource->data;
 		// Count # of tracks
 		_trackCount = 0;


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