diff options
| author | Matthew Hoops | 2010-09-07 20:18:30 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-09-07 20:18:30 +0000 |
| commit | 58139baf3710160c8382db14df26291d176e70cd (patch) | |
| tree | 88b9e8ef453e7fcda32d94e9268ea5c26c0df131 /engines/mohawk/riven.cpp | |
| parent | 4c107cc97a0d393508d570d7374a3304f564defe (diff) | |
| download | scummvm-rg350-58139baf3710160c8382db14df26291d176e70cd.tar.gz scummvm-rg350-58139baf3710160c8382db14df26291d176e70cd.tar.bz2 scummvm-rg350-58139baf3710160c8382db14df26291d176e70cd.zip | |
MOHAWK: Sound cleanup
Merge the Riven sound file code with the main Riven resource code and remove the mainSoundFile parameter from Sound::playSound(). Reasoning: The sound id's do not collide with the sound id's in the main data files. The sound archives only exist because the original CD version had the ability to choose between low and high quality audio.
svn-id: r52631
Diffstat (limited to 'engines/mohawk/riven.cpp')
| -rw-r--r-- | engines/mohawk/riven.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index c7428a92fb..bae336b46d 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -251,7 +251,7 @@ void MohawkEngine_Riven::changeToStack(uint16 n) { // The endings are in reverse order because of the way the 1.02 patch works. // The only "Data3" file is j_Data3.mhk from that patch. Patch files have higher // priorities over the regular files and are therefore loaded and checked first. - static const char *endings[] = { "_Data3.mhk", "_Data2.mhk", "_Data1.mhk", "_Data.mhk" }; + static const char *endings[] = { "_Data3.mhk", "_Data2.mhk", "_Data1.mhk", "_Data.mhk", "_Sounds.mhk" }; // Don't change stack to the current stack (if the files are loaded) if (_curStack == n && !_mhk.empty()) @@ -285,9 +285,8 @@ void MohawkEngine_Riven::changeToStack(uint16 n) { if (_mhk.empty()) error("Could not load stack %s", getStackName(_curStack).c_str()); - // Stop any currently playing sounds and load the new sound file too + // Stop any currently playing sounds _sound->stopAllSLST(); - _sound->loadRivenSounds(_curStack); } // Riven uses some hacks to change stacks for linking books |