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

[waltervn at users.sourceforge.net]

Revision: 40898
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40898&view=rev
Author:   waltervn
Date:     2009-05-26 00:03:41 +0000 (Tue, 26 May 2009)

Log Message:
-----------
SCI: Some small fixes for KQ6CD.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/engine/kernel.cpp
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/gfx/seq_decoder.cpp
    scummvm/trunk/engines/sci/gfx/seq_decoder.h

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-05-26 00:03:41 UTC (rev 40898)
@@ -1232,7 +1232,7 @@
 		{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352},
 		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
 		0,
-		SCI_VERSION_AUTODETECT,
+		7,
 		SCI_VERSION_1_1
 	},
 

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-05-26 00:03:41 UTC (rev 40898)
@@ -642,6 +642,8 @@
 		break;
 	case SCI_VERSION_1_1:
 		vocabulary_get_knames1(resmgr, names);
+		// KQ6CD calls unimplemented function 0x26
+                names[0x26] = "Dummy";
 		break;
 #ifdef ENABLE_SCI32
 	case SCI_VERSION_32:

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-26 00:03:41 UTC (rev 40898)
@@ -3330,7 +3330,7 @@
 	int frameNr = 0;
 	SeqDecoder seq;
 
-	if (!seq.loadFile(filename)) {
+	if (!seq.loadFile(filename) && !seq.loadFile(Common::String("SEQ/") + filename)) {
 		warning("Failed to open movie file %s", filename);
 		return s->r_acc;
 	}

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-26 00:03:41 UTC (rev 40898)
@@ -797,7 +797,8 @@
 		break;
 	}
 	case _K_SCI1_SOUND_GET_AUDIO_CAPABILITY : {
-		return make_reg(0, 1);//NULL_REG;
+		// Tests for digital audio support
+		return make_reg(0, 1);
 	}
 	case _K_SCI1_SOUND_PLAY_HANDLE : {
 		int looping = GET_SEL32V(obj, loop);
@@ -1051,7 +1052,12 @@
 		mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, UKPV(1));
 		break;
 	case kSci1AudioLanguage:
-		s->sound.audioResource->setAudioLang(SKPV(1));
+		if (argc == 1) {
+			// In SCI1.1: tests for digital audio support
+			return make_reg(0, 1);
+		} else {
+			s->sound.audioResource->setAudioLang(SKPV(1));
+		}
 		break;
 	default:
 		warning("kDoAudio: Unhandled case %d", UKPV(0));

Modified: scummvm/trunk/engines/sci/gfx/seq_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/seq_decoder.cpp	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/gfx/seq_decoder.cpp	2009-05-26 00:03:41 UTC (rev 40898)
@@ -34,7 +34,7 @@
 	closeFile();
 }
 
-bool SeqDecoder::loadFile(const char *fileName) {
+bool SeqDecoder::loadFile(Common::String fileName) {
 	closeFile();
 
 	_fileStream = SearchMan.createReadStreamForMember(fileName);

Modified: scummvm/trunk/engines/sci/gfx/seq_decoder.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/seq_decoder.h	2009-05-25 22:58:05 UTC (rev 40897)
+++ scummvm/trunk/engines/sci/gfx/seq_decoder.h	2009-05-26 00:03:41 UTC (rev 40898)
@@ -32,7 +32,7 @@
 public:
 	SeqDecoder() : _fileStream(0), _palette(0) { }
 	~SeqDecoder();
-	bool loadFile(const char *fileName);
+	bool loadFile(Common::String fileName);
 	void closeFile();
 	gfx_pixmap_t *getFrame(bool &hasNext);
 


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