diff options
author | Strangerke | 2013-03-20 07:27:42 +0100 |
---|---|---|
committer | Strangerke | 2013-03-20 07:27:42 +0100 |
commit | 852e65bd02bc1278386d79ca68f81e3d15e9fa43 (patch) | |
tree | e2588a3503ce1d3cadb690fefe8cfdefe30f85d9 /engines/hopkins/sound.cpp | |
parent | d9b596ad183e4784e9692ac439683dbf5f904dc2 (diff) | |
download | scummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.tar.gz scummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.tar.bz2 scummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.zip |
HOPKINS: Remove setParent() from Globals
Diffstat (limited to 'engines/hopkins/sound.cpp')
-rw-r--r-- | engines/hopkins/sound.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index d7a6c81a51..600ecba0b1 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -273,7 +273,7 @@ void SoundManager::loadAnimSound() { } void SoundManager::playAnimSound(int soundNumber) { - if (!_vm->_globals._censorshipFl && _specialSoundNum == 2) { + if (!_vm->_globals->_censorshipFl && _specialSoundNum == 2) { switch (soundNumber) { case 20: playSample(5); @@ -524,41 +524,41 @@ 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) + else if (_vm->_globals->_language == LANG_FR) filename = "RES_VFR.RES"; - else if (_vm->_globals._language == LANG_EN) + else if (_vm->_globals->_language == LANG_EN) filename = "RES_VAN.RES"; - else if (_vm->_globals._language == LANG_SP) + else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals._catalogPos; - catLen = _vm->_globals._catalogSize; + catPos = _vm->_globals->_catalogPos; + catLen = _vm->_globals->_catalogSize; } else if (!_vm->_fileManager->searchCat(filename + ".APC", RES_VOI)) { 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) + else if (_vm->_globals->_language == LANG_FR) filename = "RES_VFR.RES"; - else if (_vm->_globals._language == LANG_EN) + else if (_vm->_globals->_language == LANG_EN) filename = "RES_VAN.RES"; - else if (_vm->_globals._language == LANG_SP) + else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals._catalogPos; - catLen = _vm->_globals._catalogSize; + catPos = _vm->_globals->_catalogPos; + catLen = _vm->_globals->_catalogSize; } else if (!_vm->_fileManager->searchCat(filename + ".RAW", RES_VOI)) { 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) + else if (_vm->_globals->_language == LANG_FR) filename = "RES_VFR.RES"; - else if (_vm->_globals._language == LANG_EN) + else if (_vm->_globals->_language == LANG_EN) filename = "RES_VAN.RES"; - else if (_vm->_globals._language == LANG_SP) + else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals._catalogPos; - catLen = _vm->_globals._catalogSize; + catPos = _vm->_globals->_catalogPos; + catLen = _vm->_globals->_catalogSize; } else { if (!f.exists(filename + ".WAV")) { if (!f.exists(filename + ".APC")) |