diff options
| author | Strangerke | 2013-11-09 20:06:42 +0100 |
|---|---|---|
| committer | Strangerke | 2013-11-09 20:06:42 +0100 |
| commit | 582a681c67487c717686c21bd82bf8e930f6987e (patch) | |
| tree | 3515b33a6b8ab86a44facd37507b254d311f2945 /engines/hopkins/sound.cpp | |
| parent | 6a1b3f40fcf568c9c573ef543ce404070b985a3b (diff) | |
| download | scummvm-rg350-582a681c67487c717686c21bd82bf8e930f6987e.tar.gz scummvm-rg350-582a681c67487c717686c21bd82bf8e930f6987e.tar.bz2 scummvm-rg350-582a681c67487c717686c21bd82bf8e930f6987e.zip | |
HOPKINS: Replace cascades of if by switches for language checks
Diffstat (limited to 'engines/hopkins/sound.cpp')
| -rw-r--r-- | engines/hopkins/sound.cpp | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index bf816c08a4..92c5f51462 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -520,12 +520,19 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) filename = "ENG_VOI.RES"; // Win95 and Linux versions uses another set of names - else if (_vm->_globals->_language == LANG_FR) - filename = "RES_VFR.RES"; - else if (_vm->_globals->_language == LANG_EN) - filename = "RES_VAN.RES"; - else if (_vm->_globals->_language == LANG_SP) - filename = "RES_VES.RES"; + else { + switch (_vm->_globals->_language) { + case LANG_FR: + filename = "RES_VFR.RES"; + break; + case LANG_EN: + filename = "RES_VAN.RES"; + break; + case LANG_SP: + filename = "RES_VES.RES"; + break; + } + } catPos = _vm->_fileIO->_catalogPos; catLen = _vm->_fileIO->_catalogSize; @@ -535,12 +542,19 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) filename = "ENG_VOI.RES"; // Win95 and Linux versions uses another set of names - else if (_vm->_globals->_language == LANG_FR) - filename = "RES_VFR.RES"; - else if (_vm->_globals->_language == LANG_EN) - filename = "RES_VAN.RES"; - else if (_vm->_globals->_language == LANG_SP) - filename = "RES_VES.RES"; + else { + switch (_vm->_globals->_language) { + case LANG_FR: + filename = "RES_VFR.RES"; + break; + case LANG_EN: + filename = "RES_VAN.RES"; + break; + case LANG_SP: + filename = "RES_VES.RES"; + break; + } + } catPos = _vm->_fileIO->_catalogPos; catLen = _vm->_fileIO->_catalogSize; @@ -550,12 +564,19 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) filename = "ENG_VOI.RES"; // Win95 and Linux versions uses another set of names - else if (_vm->_globals->_language == LANG_FR) - filename = "RES_VFR.RES"; - else if (_vm->_globals->_language == LANG_EN) - filename = "RES_VAN.RES"; - else if (_vm->_globals->_language == LANG_SP) - filename = "RES_VES.RES"; + else { + switch (_vm->_globals->_language) { + case LANG_FR: + filename = "RES_VFR.RES"; + break; + case LANG_EN: + filename = "RES_VAN.RES"; + break; + case LANG_SP: + filename = "RES_VES.RES"; + break; + } + } catPos = _vm->_fileIO->_catalogPos; catLen = _vm->_fileIO->_catalogSize; |