[Scummvm-cvs-logs] scummvm master -> 916bce0340b372288271a45ebc4d691ad513ac0a

[m-kiewitz]

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:
916bce0340 SHERLOCK: 3DO: load sounds from room sounds dir


Commit: 916bce0340b372288271a45ebc4d691ad513ac0a
    https://github.com/scummvm/scummvm/commit/916bce0340b372288271a45ebc4d691ad513ac0a
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-13T10:36:33+02:00

Commit Message:
SHERLOCK: 3DO: load sounds from room sounds dir

if no directory was given, load sounds from room sounds directory

Changed paths:
    engines/sherlock/sound.cpp



diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 7ff1ead..3389732 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -136,6 +136,10 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 		} else {
 			// 3DO uses .aiff extension
 			filename += ".AIFF";
+			if (!filename.contains('/')) {
+				// if no directory was given, use the room sounds directory
+				filename = "rooms/sounds/" + filename;
+			}
 		}
 	}