diff options
| author | Torbjörn Andersson | 2004-06-28 08:45:09 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-06-28 08:45:09 +0000 |
| commit | 6b99d5a9718217d174ca23074057eb2f08b5c30d (patch) | |
| tree | 2025c5db3bc5803ac40067eb265899493196bcbf | |
| parent | 8d5cb06d255c05624ad6e502ccd44bb1cc38a9ce (diff) | |
| download | scummvm-rg350-6b99d5a9718217d174ca23074057eb2f08b5c30d.tar.gz scummvm-rg350-6b99d5a9718217d174ca23074057eb2f08b5c30d.tar.bz2 scummvm-rg350-6b99d5a9718217d174ca23074057eb2f08b5c30d.zip | |
Added "MUSIC" / "music" to the list of default directories.
svn-id: r14100
| -rw-r--r-- | sword1/music.cpp | 2 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sword1/music.cpp b/sword1/music.cpp index 586a93638e..b8b6d010fe 100644 --- a/sword1/music.cpp +++ b/sword1/music.cpp @@ -184,7 +184,7 @@ void Music::startMusic(int32 tuneId, int32 loopFlag) { newStream = 0; } char fName[20]; - sprintf(fName, "music/%s.wav", _tuneList[tuneId]); + sprintf(fName, "%s.wav", _tuneList[tuneId]); if (_handles[newStream].play(fName, loopFlag != 0)) { delete _converter[newStream]; _converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false); diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index d129d5bee1..da41398659 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -100,9 +100,11 @@ void SwordEngine::initialize(void) { // Add default file directories File::addDefaultDirectory(_gameDataPath + "/CLUSTERS/"); + File::addDefaultDirectory(_gameDataPath + "/MUSIC/"); File::addDefaultDirectory(_gameDataPath + "/SPEECH/"); File::addDefaultDirectory(_gameDataPath + "/VIDEO/"); File::addDefaultDirectory(_gameDataPath + "/clusters/"); + File::addDefaultDirectory(_gameDataPath + "/music/"); File::addDefaultDirectory(_gameDataPath + "/speech/"); File::addDefaultDirectory(_gameDataPath + "/video/"); |