diff options
| author | Filippos Karapetis | 2009-05-30 09:07:28 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-30 09:07:28 +0000 |
| commit | 4960b64b484d3e80258feedea3f711704d7e0743 (patch) | |
| tree | 629a077d44a22c22681dbec53d336bf9e48a09a6 | |
| parent | a6abd5c2fc232ab589af0acde95f519cabc75659 (diff) | |
| download | scummvm-rg350-4960b64b484d3e80258feedea3f711704d7e0743.tar.gz scummvm-rg350-4960b64b484d3e80258feedea3f711704d7e0743.tar.bz2 scummvm-rg350-4960b64b484d3e80258feedea3f711704d7e0743.zip | |
Fixed a silly typo in commit #40979. Suffixes should be loaded correctly again
svn-id: r41018
| -rw-r--r-- | engines/sci/vocabulary.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/vocabulary.cpp b/engines/sci/vocabulary.cpp index aebccc7fbd..df2c1bc6d2 100644 --- a/engines/sci/vocabulary.cpp +++ b/engines/sci/vocabulary.cpp @@ -226,10 +226,10 @@ const char *vocab_get_any_group_word(int group, const WordMap &words) { bool vocab_get_suffixes(ResourceManager *resmgr, SuffixList &suffixes) { // Determine if we got a SCI0 vocabulary loaded - Resource* resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_MAIN_VOCAB, 1); + Resource* resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_SUFFIX_VOCAB, 1); if (!resource) // No SCI0 vocabulary? Try SCI1 - resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB, 1); + resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_SUFFIX_VOCAB, 1); if (!resource) return false; // No vocabulary found @@ -264,14 +264,14 @@ bool vocab_get_suffixes(ResourceManager *resmgr, SuffixList &suffixes) { void vocab_free_suffixes(ResourceManager *resmgr, SuffixList &suffixes) { // Determine if we got a SCI0 vocabulary loaded - Resource* resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_MAIN_VOCAB, 0); + Resource* resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_SUFFIX_VOCAB, 0); if (resource && resource->status == kResStatusLocked) { - resmgr->unlockResource(resource, VOCAB_RESOURCE_SCI0_MAIN_VOCAB, kResourceTypeVocab); + resmgr->unlockResource(resource, VOCAB_RESOURCE_SCI0_SUFFIX_VOCAB, kResourceTypeVocab); } else { // No SCI0 vocabulary? Try SCI1 - resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB, 0); + resource = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_SUFFIX_VOCAB, 0); if (resource && resource->status == kResStatusLocked) - resmgr->unlockResource(resource, VOCAB_RESOURCE_SCI1_MAIN_VOCAB, kResourceTypeVocab); + resmgr->unlockResource(resource, VOCAB_RESOURCE_SCI1_SUFFIX_VOCAB, kResourceTypeVocab); } suffixes.clear(); |