[Scummvm-cvs-logs] SF.net SVN: scummvm:[48139] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 48139
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48139&view=rev
Author:   thebluegr
Date:     2010-02-26 22:24:48 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
Fixed the music in some Mac versions of ITE and disabled some unused code for the original DOS demo of ITE

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp
    scummvm/trunk/engines/saga/saga.h
    scummvm/trunk/engines/saga/script.cpp

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2010-02-26 17:55:27 UTC (rev 48138)
+++ scummvm/trunk/engines/saga/music.cpp	2010-02-26 22:24:48 UTC (rev 48139)
@@ -306,6 +306,13 @@
 				if (!_digitalMusicContext->isCompressed()) {
 					byte musicFlags = Audio::FLAG_STEREO |
 										Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
+
+					if (_vm->isBigEndian())
+						musicFlags &= ~Audio::FLAG_LITTLE_ENDIAN;
+
+					if (_vm->getFeatures() & GF_MONO_MUSIC)
+						musicFlags &= ~Audio::FLAG_STEREO;
+
 					audioStream = Audio::makeRawStream(musicStream, 11025, musicFlags, DisposeAfterUse::YES);
 				} else {
 					// Read compressed header to determine compression type

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2010-02-26 17:55:27 UTC (rev 48138)
+++ scummvm/trunk/engines/saga/saga.h	2010-02-26 22:24:48 UTC (rev 48139)
@@ -145,7 +145,9 @@
 	GF_ITE_FLOPPY        = 1 << 1,
 	GF_SCENE_SUBSTITUTES = 1 << 2,
 	GF_NON_INTERACTIVE   = 1 << 3,
-	GF_OLD_ITE_DOS       = 1 << 4,
+#if 0
+	GF_OLD_ITE_DOS       = 1 << 4, 	// Currently unused
+#endif
 	GF_MONO_MUSIC        = 1 << 5,
 	GF_EXTRA_ITE_CREDITS = 1 << 6,
 	GF_IHNM_DEMO         = 1 << 7,

Modified: scummvm/trunk/engines/saga/script.cpp
===================================================================
--- scummvm/trunk/engines/saga/script.cpp	2010-02-26 17:55:27 UTC (rev 48138)
+++ scummvm/trunk/engines/saga/script.cpp	2010-02-26 22:24:48 UTC (rev 48139)
@@ -988,15 +988,19 @@
 
 	// now data contains last string index
 
+#if 0
 	if (_vm->getFeatures() & GF_OLD_ITE_DOS) { // special ITE dos
 		if ((_vm->_scene->currentSceneNumber() == ITE_DEFAULT_SCENE) &&
 			(iparam1 >= 288) && (iparam1 <= (RID_SCENE1_VOICE_END - RID_SCENE1_VOICE_START + 288))) {
 			sampleResourceId = RID_SCENE1_VOICE_START + iparam1 - 288;
 		}
 	} else {
+#endif
 		if (thread->_voiceLUT->voicesCount > first)
 			sampleResourceId = thread->_voiceLUT->voices[first];
+#if 0
 	}
+#endif
 
 	if (sampleResourceId < 0 || sampleResourceId > 4000)
 		sampleResourceId = -1;


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