[Scummvm-cvs-logs] scummvm master -> b9a93f354b5f783be8e4c3aaf673b7105b8809a7

fuzzie fuzzie at fuzzie.org
Tue Feb 7 13:22:17 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b9a93f354b Revert "SKY: Map the floppy intro track."


Commit: b9a93f354b5f783be8e4c3aaf673b7105b8809a7
    https://github.com/scummvm/scummvm/commit/b9a93f354b5f783be8e4c3aaf673b7105b8809a7
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-02-07T04:20:50-08:00

Commit Message:
Revert "SKY: Map the floppy intro track."

This reverts commit 0599145ecf92aeabf5bd4221a91761237f970323.
This mapping was incorrect, 503 is the outro.

Changed paths:
    engines/sky/music/musicbase.cpp



diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp
index c4e5ba4..b388afd 100644
--- a/engines/sky/music/musicbase.cpp
+++ b/engines/sky/music/musicbase.cpp
@@ -117,10 +117,6 @@ void MusicBase::loadNewMusic() {
 	} else if (section == 5 && song == 6) {
 		section = 4;
 		song = 4;
-	} else if (section == 0 && song == 1) {
-		// floppy intro
-		section = 5;
-		song = 3;
 	}
 	Common::String trackName = Common::String::format("music_%d%02d", section, song);
 	Audio::SeekableAudioStream *stream = Audio::SeekableAudioStream::openStreamFile(trackName);






More information about the Scummvm-git-logs mailing list