[Scummvm-cvs-logs] scummvm master -> 5023a5764f3c4f394f9454685340d89f8cb571af

Strangerke Strangerke at scummvm.org
Mon Oct 15 07:09:33 CEST 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:
5023a5764f TONY: Fix music bug - 2 songs played simultaneously eventually


Commit: 5023a5764f3c4f394f9454685340d89f8cb571af
    https://github.com/scummvm/scummvm/commit/5023a5764f3c4f394f9454685340d89f8cb571af
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-10-14T22:08:24-07:00

Commit Message:
TONY: Fix music bug - 2 songs played simultaneously eventually

Changed paths:
    engines/tony/sound.cpp
    engines/tony/tony.cpp



diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 2844e0d..20386d6 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -489,6 +489,7 @@ bool FPStream::loadFile(const Common::String &fileName, uint32 codec, int bufSiz
 		// Fallback: try with an extra '0' prefix
 		if (!_file.open("0" + fileName))
 			return false;
+		warning("FPStream::loadFile(): Fallback from %s to %s", fileName.c_str(), _file.getName());
 	}
 
 	// Save the size of the stream
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 1c63096..86740c6 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -55,6 +55,7 @@ TonyEngine::TonyEngine(OSystem *syst, const TonyGameDescription *gameDesc) : Eng
 	SearchMan.addSubDirectoryMatching(gameDataDir, "Roasted");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "Music");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "Music/utilsfx");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "Music/Layer");
 
 	// Set up load slot number
 	_initialLoadSlotNumber = -1;






More information about the Scummvm-git-logs mailing list