diff options
| author | Filippos Karapetis | 2007-10-30 22:20:02 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-10-30 22:20:02 +0000 |
| commit | bb0bbdef57265d3bbf729399f80cd00759cd82d1 (patch) | |
| tree | 25400f4b4b28bd825aa80f0a2ff3be19879a5726 /engines/saga | |
| parent | e7e0532e1b31b5b125265fae8e39e0e9e8698b36 (diff) | |
| download | scummvm-rg350-bb0bbdef57265d3bbf729399f80cd00759cd82d1.tar.gz scummvm-rg350-bb0bbdef57265d3bbf729399f80cd00759cd82d1.tar.bz2 scummvm-rg350-bb0bbdef57265d3bbf729399f80cd00759cd82d1.zip | |
The cause for bug #1804403 - "IHNM/ITE: Error loading Game resources (fs-node regression)" was fixed with commits #29327, #29328, #29329. Removed unneeded Amiga-specific code, which should finally fix this bug
svn-id: r29331
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/rscfile.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index 95503592d5..a081b200a9 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -440,28 +440,16 @@ bool Resource::createContexts() { sprintf(voicesFileName, "voicesd.cmp"); _vm->_gf_compressed_sounds = true; } -#ifndef __amigaos4__ } else if (Common::File::exists("inherit the earth voices") || Common::File::exists("inherit the earth voices.cmp")) { + _contextsCount++; + voicesFileIndex = _contextsCount - 1; if (Common::File::exists("inherit the earth voices")) { sprintf(voicesFileName, "inherit the earth voices"); } else { sprintf(voicesFileName, "inherit the earth voices.cmp"); _vm->_gf_compressed_sounds = true; } -#else - } else if (Common::File::exists("\"inherit the earth voices\"") || - Common::File::exists("\"inherit the earth voices.cmp\"")) { - if (Common::File::exists("\"inherit the earth voices\"")) { - sprintf(voicesFileName, "\"inherit the earth voices\""); - } else { - sprintf(voicesFileName, "\"inherit the earth voices.cmp\""); - _vm->_gf_compressed_sounds = true; - } -#endif - - _contextsCount++; - voicesFileIndex = _contextsCount - 1; // The resources in the Wyrmkeep combined Windows/Mac/Linux CD version are little endian, but // the voice file is big endian. If we got such a version with mixed files, mark this voice file |