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

[thebluegr at users.sourceforge.net]

Revision: 40935
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40935&view=rev
Author:   thebluegr
Date:     2009-05-27 08:48:57 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Added a warning when kDoAudio is called with the new semantics (SQ4CD or newer) and fixed the detection entry for SQ4CD

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/engine/ksound.cpp

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-05-27 04:01:14 UTC (rev 40934)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-05-27 08:48:57 UTC (rev 40935)
@@ -3072,7 +3072,7 @@
 
 	// Space Quest 4 - English DOS CD (from the Space Quest Collection)
 	// Executable scanning reports "1.001.064", VERSION file reports "1.0"
-	{{"sq4", "", {
+	{{"sq4", "CD", {
 		{"resource.map", 0, "ed90a8e3ccc53af6633ff6ab58392bae", 7054},
 		{"resource.000", 0, "63247e3901ab8963d4eece73747832e0", 5157378},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-27 04:01:14 UTC (rev 40934)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-27 08:48:57 UTC (rev 40935)
@@ -1005,13 +1005,19 @@
 
 	switch (UKPV(0)) {
 	case kSci1AudioWPlay:
-	case kSci1AudioPlay: {
+	case kSci1AudioPlay:
 		s->sound.audioResource->stop();
 
-		Audio::AudioStream *audioStream = s->sound.audioResource->getAudioStream(UKPV(1), &sampleLen);
+		if (argc == 2) {			// KQ5CD, KQ6 floppy
+			Audio::AudioStream *audioStream = s->sound.audioResource->getAudioStream(UKPV(1), &sampleLen);
 
-		if (audioStream)
-			mixer->playInputStream(Audio::Mixer::kSpeechSoundType, s->sound.audioResource->getAudioHandle(), audioStream);
+			if (audioStream)
+				mixer->playInputStream(Audio::Mixer::kSpeechSoundType, s->sound.audioResource->getAudioHandle(), audioStream);
+		} else if (argc == 6) {		// SQ4CD or newer
+			// TODO
+			warning("kDoAudio: Play called with new semantics - 5 parameters: %d %d %d %d %d", UKPV(1), UKPV(2), UKPV(3), UKPV(4), UKPV(5));
+		} else {					// Hopefully, this should never happen
+			warning("kDoAudio: Play called with an unknown number of parameters (%d)", argc);
 		}
 		return make_reg(0, sampleLen);		// return sample length in ticks
 	case kSci1AudioStop:


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