diff options
| author | Filippos Karapetis | 2013-01-07 16:17:27 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2013-01-07 16:17:27 +0200 |
| commit | bd865d9741878b56a86c1389e66dfdee24ba1e39 (patch) | |
| tree | c7295b08c88991a57883daa404d87d53f7ea8ecf /engines/hopkins/sound.cpp | |
| parent | b270942f6e6aa8a84cf48a0d77a4e822cc26c79e (diff) | |
| download | scummvm-rg350-bd865d9741878b56a86c1389e66dfdee24ba1e39.tar.gz scummvm-rg350-bd865d9741878b56a86c1389e66dfdee24ba1e39.tar.bz2 scummvm-rg350-bd865d9741878b56a86c1389e66dfdee24ba1e39.zip | |
HOPKINS: Remove static game directory configuration options
Also, remove the unused VGA folder.
This is the first step to remove constructFilename() and associated functions.
Diffstat (limited to 'engines/hopkins/sound.cpp')
| -rw-r--r-- | engines/hopkins/sound.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index cf06046bbe..a55ef4d442 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -380,7 +380,7 @@ void SoundManager::PLAY_MOD(const Common::String &file) { modFile += "2"; } } - _vm->_fileManager.constructFilename(_vm->_globals.HOPMUSIC, modFile); + _vm->_fileManager.constructFilename("MUSIC", modFile); if (MOD_FLAG) { stopMusic(); delMusic(); @@ -520,34 +520,34 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode) { if (!_vm->_fileManager.searchCat(filename + ".WAV", 9)) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "ENG_VOI.RES"); + _vm->_fileManager.constructFilename("VOICE", "ENG_VOI.RES"); // Win95 and Linux versions uses another set of names else if (_vm->_globals._language == LANG_FR) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VFR.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VFR.RES"); else if (_vm->_globals._language == LANG_EN) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VAN.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VAN.RES"); else if (_vm->_globals._language == LANG_SP) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VES.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VES.RES"); catPos = _vm->_globals._catalogPos; catLen = _vm->_globals._catalogSize; } else if (!_vm->_fileManager.searchCat(filename + ".APC", 9)) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "ENG_VOI.RES"); + _vm->_fileManager.constructFilename("VOICE", "ENG_VOI.RES"); // Win95 and Linux versions uses another set of names else if (_vm->_globals._language == LANG_FR) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VFR.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VFR.RES"); else if (_vm->_globals._language == LANG_EN) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VAN.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VAN.RES"); else if (_vm->_globals._language == LANG_SP) - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VES.RES"); + _vm->_fileManager.constructFilename("VOICE", "RES_VES.RES"); catPos = _vm->_globals._catalogPos; catLen = _vm->_globals._catalogSize; } else { - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, filename + ".WAV"); + _vm->_fileManager.constructFilename("VOICE", filename + ".WAV"); if (!f.exists(_vm->_globals._curFilename)) { - _vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, filename + ".APC"); + _vm->_fileManager.constructFilename("VOICE", filename + ".APC"); if (!f.exists(_vm->_globals._curFilename)) return false; } @@ -626,7 +626,7 @@ void SoundManager::MODSetMusicVolume(int volume) { } void SoundManager::loadSample(int wavIndex, const Common::String &file) { - _vm->_fileManager.constructFilename(_vm->_globals.HOPSOUND, file); + _vm->_fileManager.constructFilename("SOUND", file); LOAD_SAMPLE2_SDL(wavIndex, _vm->_globals._curFilename, 0); SOUND[wavIndex]._active = true; } @@ -758,7 +758,7 @@ void SoundManager::LOAD_SAMPLE2_SDL(int wavIndex, const Common::String &filename } void SoundManager::LOAD_NWAV(const Common::String &file, int wavIndex) { - _vm->_fileManager.constructFilename(_vm->_globals.HOPSOUND, file); + _vm->_fileManager.constructFilename("SOUND", file); LOAD_SAMPLE2_SDL(wavIndex, _vm->_globals._curFilename, 1); } |