diff options
| author | Filippos Karapetis | 2009-03-30 20:51:09 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-03-30 20:51:09 +0000 |
| commit | 5f0083e9961d538fe4e156f38e4565363f3c7fd6 (patch) | |
| tree | 55ecf97da11f333733ae644e84a915f03b4dc398 /engines/sci | |
| parent | f7748cfefcdcc9714982aec6fc73c31c924ed87e (diff) | |
| download | scummvm-rg350-5f0083e9961d538fe4e156f38e4565363f3c7fd6.tar.gz scummvm-rg350-5f0083e9961d538fe4e156f38e4565363f3c7fd6.tar.bz2 scummvm-rg350-5f0083e9961d538fe4e156f38e4565363f3c7fd6.zip | |
Ignore the unreliable resource vocab.999 in SCI1 games. This allows us to use the hardcoded table in vocabulary_get_knames1() instead (also check commit #39694). KQ5 floppy works now without FreeSCI's custom vocabulary file
svn-id: r39766
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/scicore/resource.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index 392ea3b560..14a430c383 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -901,7 +901,10 @@ void ResourceManager::readResourcePatches(ResourceSource *source) { // SCI1 scheme if (isdigit(name[0])) { number = atoi(name.c_str()); - bAdd = true; + // vocab.999/999.voc is notoriously unreliable in SCI1 games, and should not be used + // Also check vocabulary_get_knames1() + if (number != VOCAB_RESOURCE_KNAMES) + bAdd = true; } else { // SCI0 scheme int resname_len = strlen(szResType); |