diff options
| author | Strangerke | 2013-03-24 22:56:06 +0100 |
|---|---|---|
| committer | Strangerke | 2013-03-24 22:56:06 +0100 |
| commit | ac338c3517d85156e83884164d378c3bf76851e5 (patch) | |
| tree | 1a2e3df43d79fae887b130a57d95c6c4ce4ff0af /engines/hopkins/sound.cpp | |
| parent | 57abce19b1da832f1f108f6aff22e40649572f97 (diff) | |
| download | scummvm-rg350-ac338c3517d85156e83884164d378c3bf76851e5.tar.gz scummvm-rg350-ac338c3517d85156e83884164d378c3bf76851e5.tar.bz2 scummvm-rg350-ac338c3517d85156e83884164d378c3bf76851e5.zip | |
HOPKINS: Some more refactoring in Globals
Diffstat (limited to 'engines/hopkins/sound.cpp')
| -rw-r--r-- | engines/hopkins/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index 1605b0350e..246e611642 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -528,8 +528,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals->_catalogPos; - catLen = _vm->_globals->_catalogSize; + catPos = _vm->_fileManager->_catalogPos; + catLen = _vm->_fileManager->_catalogSize; } else if (!_vm->_fileManager->searchCat(filename + ".APC", RES_VOI)) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) filename = "ENG_VOI.RES"; @@ -541,8 +541,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals->_catalogPos; - catLen = _vm->_globals->_catalogSize; + catPos = _vm->_fileManager->_catalogPos; + catLen = _vm->_fileManager->_catalogSize; } else if (!_vm->_fileManager->searchCat(filename + ".RAW", RES_VOI)) { if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) filename = "ENG_VOI.RES"; @@ -554,8 +554,8 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) { else if (_vm->_globals->_language == LANG_SP) filename = "RES_VES.RES"; - catPos = _vm->_globals->_catalogPos; - catLen = _vm->_globals->_catalogSize; + catPos = _vm->_fileManager->_catalogPos; + catLen = _vm->_fileManager->_catalogSize; } else { if (!f.exists(filename + ".WAV")) { if (!f.exists(filename + ".APC")) |