[Scummvm-git-logs] scummvm master -> cffe01536e39323b28668ae6fdb1d4758bd64d11

[csnover]

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:
cffe01536e SCI32: Add 'music/' subdir to file path for LSL7 GOG


Commit: cffe01536e39323b28668ae6fdb1d4758bd64d11
    https://github.com/scummvm/scummvm/commit/cffe01536e39323b28668ae6fdb1d4758bd64d11
Author: Hein-Pieter van Braam (hp at tmm.cx)
Date: 2017-05-23T23:16:15-05:00

Commit Message:
SCI32: Add 'music/' subdir to file path for LSL7 GOG

LSL7 originally came with music in two qualities in subdirectories of
the 'music' directory, 22s8 and 22s16. The gog.com release doesn't do
this and only ships the hq music in the root of 'music/'. This PR adds
it to the search path.

Closes gh-951.

Changed paths:
    engines/sci/sci.cpp


diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 7dab65a..59f1b35 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -151,6 +151,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam
 	SearchMan.addSubDirectoryMatching(gameDataDir, "robots");	// robot movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "movie");	// VMD movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "movies");	// VMD movie files
+	SearchMan.addSubDirectoryMatching(gameDataDir, "music");	// LSL7 music files (GOG version)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "music/22s16");	// LSL7 music files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "vmd");	// VMD movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "duk");	// Duck movie files in Phantasmagoria 2