From 5023a5764f3c4f394f9454685340d89f8cb571af Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 15 Oct 2012 07:08:24 +0200
Subject: TONY: Fix music bug - 2 songs played simultaneously eventually

---
 engines/tony/sound.cpp | 1 +
 engines/tony/tony.cpp  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'engines/tony')

diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 2844e0d925..20386d6353 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 1c63096e92..86740c6fe5 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;
-- 
cgit v1.2.3