diff options
| -rw-r--r-- | scumm/actor.cpp | 1 | ||||
| -rw-r--r-- | scumm/resource_v3.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index ceac475a92..b8e591acdb 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1484,7 +1484,6 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold) } void Scumm::resetActorBgs() { -// Actor *a; int i, j; for (i = 0; i < gdi._numStrips; i++) { diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp index eea2ec334e..92b103ef34 100644 --- a/scumm/resource_v3.cpp +++ b/scumm/resource_v3.cpp @@ -175,7 +175,7 @@ void Scumm_v3::loadCharset(int no) { sprintf(buf, "%02d.LFL", 99 - no); - file.open(buf, _gameDataPath); + file.open(buf, getGameDataPath()); if (file.isOpen() == false) { error("loadCharset(%d): Missing file charset: %s", no, buf); diff --git a/scumm/sound.cpp b/scumm/sound.cpp index b52255d673..bbc8ff11ac 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -443,7 +443,7 @@ void Sound::processSfxQueues() { if (act != 0 && (uint) act < 0x80 && !_scumm->_string[0].no_talk_anim) { a = _scumm->derefActor(act, "processSfxQueues"); - if (a->room == _scumm->_currentRoom && (finished || !_endOfMouthSync)) { + if (a->isInCurrentRoom() && (finished || !_endOfMouthSync)) { b = true; if (!finished) b = isMouthSyncOff(_curSoundPos); diff --git a/scumm/string.cpp b/scumm/string.cpp index e802259786..42b91ac657 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -765,9 +765,9 @@ void Scumm::loadLanguageBundle() { int32 size; if (_gameId == GID_DIG) { - file.open("language.bnd", _gameDataPath); + file.open("language.bnd", getGameDataPath()); } else if (_gameId == GID_CMI) { - file.open("language.tab", _gameDataPath); + file.open("language.tab", getGameDataPath()); } else { return; } @@ -865,7 +865,7 @@ void Scumm::translateText(const byte *text, byte *trans_buff) { if (found != NULL) { File file; - file.open("language.tab", _gameDataPath); + file.open("language.tab", getGameDataPath()); if (file.isOpen()) { byte *ptr = trans_buff; byte c; |