[Scummvm-cvs-logs] SF.net SVN: scummvm: [25762] scummvm/trunk/engines/agos/res_snd.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Wed Feb 21 13:34:15 CET 2007


Revision: 25762
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25762&view=rev
Author:   kirben
Date:     2007-02-21 04:34:14 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Skip music track 35 in CD releases of Simon 1, since it was replace by sound effect and the script was not updated.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/res_snd.cpp

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2007-02-21 12:33:34 UTC (rev 25761)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2007-02-21 12:34:14 UTC (rev 25762)
@@ -178,6 +178,7 @@
 		_nextMusicToPlay = -1;
 	} else if (getGameType() == GType_SIMON1) {
 		midi.stop();
+		midi.setLoop(true); // Must do this BEFORE loading music. (GMF may have its own override.)
 
 		// Support for compressed music from the ScummVM Music Enhancement Project
 		AudioCD.stop();
@@ -190,12 +191,10 @@
 		} else if (getPlatform() == Common::kPlatformAmiga) {
 			loadModule(music);
 		} else if (getFeatures() & GF_TALKIE) {
-			// FIXME: The very last music resource, a cymbal crash for when the
-			// two demons crash into each other, should NOT be looped like the
-			// other music tracks. In simon1dos/talkie the GMF resource includes
-			// a loop override that acomplishes this, but there seems to be nothing
-			// for this in the SMF resources.
-			midi.setLoop(music != 35); // Must do this BEFORE loading music. (GMF may have its own override.)
+			// We skip this music resource, as it was replaced by
+			// a sound effect, and the script was never updated.
+			if (music == 35)
+				return;
 
 			_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
 			_gameFile->read(buf, 4);
@@ -216,7 +215,6 @@
 			if (f.isOpen() == false)
 				error("loadMusic: Can't load music from '%s'", filename);
 
-			midi.setLoop(true); // Must do this BEFORE loading music. (GMF may have its own override.)
 			if (getFeatures() & GF_DEMO)
 				midi.loadS1D(&f);
 			else


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