diff options
| -rw-r--r-- | engines/groovie/groovie.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/music.cpp | 6 | ||||
| -rw-r--r-- | engines/groovie/music.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 554ae792de..c30154ba01 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -94,7 +94,7 @@ Common::Error GroovieEngine::init() { } // Create the music player - _musicPlayer = new MusicPlayer(this); + _musicPlayer = new MusicPlayer(this, _gameDescription->version == kGroovieT7G ? "fat" : "sample"); // Load volume levels syncSoundSettings(); diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 65cedfeb25..2fe9b42c67 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -31,7 +31,7 @@ namespace Groovie { -MusicPlayer::MusicPlayer(GroovieEngine *vm) : +MusicPlayer::MusicPlayer(GroovieEngine *vm, const Common::String >lName) : _vm(vm), _midiParser(NULL), _data(NULL), _driver(NULL), _backgroundFileRef(0), _gameVolume(100), _prevCDtrack(0) { // Create the parser @@ -52,7 +52,7 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) : if (driver == MD_ADLIB) { // MIDI through AdLib _musicType = MD_ADLIB; - loadTimbres("fat.ad"); + loadTimbres(gtlName + ".ad"); // Setup the percussion channel for (unsigned int i = 0; i < _timbres.size(); i++) { @@ -62,7 +62,7 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) : } else if ((driver == MD_MT32) || ConfMan.getBool("native_mt32")) { // MT-32 _musicType = MD_MT32; - loadTimbres("fat.mt"); + loadTimbres(gtlName + ".mt"); } else { // GM _musicType = 0; diff --git a/engines/groovie/music.h b/engines/groovie/music.h index aa774fe2bf..43d020b198 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -36,7 +36,7 @@ namespace Groovie { class MusicPlayer : public MidiDriver { public: - MusicPlayer(GroovieEngine *vm); + MusicPlayer(GroovieEngine *vm, const Common::String >lName); ~MusicPlayer(); void playSong(uint16 fileref); void setBackgroundSong(uint16 fileref); |