diff options
| author | Max Horn | 2004-06-27 22:03:38 +0000 |
|---|---|---|
| committer | Max Horn | 2004-06-27 22:03:38 +0000 |
| commit | b7f9e2137bcccf0928c8116333db5a8a6536e94a (patch) | |
| tree | f4682dd7ccd10d293c9037090570f9412cb670be /scumm/imuse_digi/dimuse_sndmgr.cpp | |
| parent | df984b3824c596c7f7e6a12e33bbbe0b2b470586 (diff) | |
| download | scummvm-rg350-b7f9e2137bcccf0928c8116333db5a8a6536e94a.tar.gz scummvm-rg350-b7f9e2137bcccf0928c8116333db5a8a6536e94a.tar.bz2 scummvm-rg350-b7f9e2137bcccf0928c8116333db5a8a6536e94a.zip | |
Thanks to File::setDefaultDirectory(), in most cases it is *not* necessary to pass getGameDataPath() on to File::open()
svn-id: r14088
Diffstat (limited to 'scumm/imuse_digi/dimuse_sndmgr.cpp')
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index 7e5a6b2513..94ebc7e03b 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -224,7 +224,7 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) { sound->bundle = new BundleMgr(_cacheBundleDir); if (_vm->_gameId == GID_CMI) { if (_vm->_features & GF_DEMO) { - result = sound->bundle->openFile("music.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("music.bun"); } else { char musicfile[20]; if (disk == -1) @@ -238,14 +238,14 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) { // sound->bundle->closeFile(); // } - result = sound->bundle->openFile(musicfile, _vm->getGameDataPath()); + result = sound->bundle->openFile(musicfile); if (result == false) - result = sound->bundle->openFile("music.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("music.bun"); _disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK); } } else if (_vm->_gameId == GID_DIG) - result = sound->bundle->openFile("digmusic.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("digmusic.bun"); else error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load"); @@ -258,7 +258,7 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) { sound->bundle = new BundleMgr(_cacheBundleDir); if (_vm->_gameId == GID_CMI) { if (_vm->_features & GF_DEMO) { - result = sound->bundle->openFile("voice.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("voice.bun"); } else { char voxfile[20]; if (disk == -1) @@ -272,14 +272,14 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) { // sound->bundle->closeFile(); // } - result = sound->bundle->openFile(voxfile, _vm->getGameDataPath()); + result = sound->bundle->openFile(voxfile); if (result == false) - result = sound->bundle->openFile("voice.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("voice.bun"); _disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK); } } else if (_vm->_gameId == GID_DIG) - result = sound->bundle->openFile("digvoice.bun", _vm->getGameDataPath()); + result = sound->bundle->openFile("digvoice.bun"); else error("ImuseDigiSndMgr::openVoiceBundle() Don't know which bundle file to load"); |