diff options
| -rw-r--r-- | scumm/scumm.cpp | 1 | ||||
| -rw-r--r-- | scumm/sound.cpp | 16 | ||||
| -rw-r--r-- | scumm/string.cpp | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index b3110f762d..2cdac222a8 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -505,7 +505,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _copyProtection = false; _demoMode = false; _confirmExit = false; - _msgPtrToAdd = NULL; _talkDelay = 0; _keepText = false; _existLanguageFile = false; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index e46a43c929..c35db2a107 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -881,8 +881,8 @@ File *Sound::openSfxFile() { #ifdef USE_FLAC if (!file->isOpen()) { sprintf(buf, "%s.sof", _vm->getGameName()); - if (!file->open(buf, _vm->getGameDataPath())) - file->open("monster.sof", _vm->getGameDataPath()); + if (!file->open(buf)) + file->open("monster.sof"); if (file->isOpen()) _sound_mode = kFlacMode; } @@ -891,8 +891,8 @@ File *Sound::openSfxFile() { #ifdef USE_MAD if (!file->isOpen()) { sprintf(buf, "%s.so3", _vm->getGameName()); - if (!file->open(buf, _vm->getGameDataPath())) - file->open("monster.so3", _vm->getGameDataPath()); + if (!file->open(buf)) + file->open("monster.so3"); if (file->isOpen()) _sound_mode = kMP3Mode; } @@ -901,8 +901,8 @@ File *Sound::openSfxFile() { #ifdef USE_VORBIS if (!file->isOpen()) { sprintf(buf, "%s.sog", _vm->getGameName()); - if (!file->open(buf, _vm->getGameDataPath())) - file->open("monster.sog", _vm->getGameDataPath()); + if (!file->open(buf)) + file->open("monster.sog"); if (file->isOpen()) _sound_mode = kVorbisMode; } @@ -943,8 +943,8 @@ File *Sound::openSfxFile() { } sprintf(buf, "%s.sou", _vm->getGameName()); - if (!file->open(buf, _vm->getGameDataPath())) { - file->open("monster.sou", _vm->getGameDataPath()); + if (!file->open(buf)) { + file->open("monster.sou"); } if (!file->isOpen()) { diff --git a/scumm/string.cpp b/scumm/string.cpp index 1a096905e5..44c7222d6d 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -719,9 +719,9 @@ void ScummEngine::loadLanguageBundle() { int32 size; if (_gameId == GID_DIG) { - file.open("language.bnd", getGameDataPath()); + file.open("language.bnd"); } else if (_gameId == GID_CMI) { - file.open("language.tab", getGameDataPath()); + file.open("language.tab"); } else { return; } |