thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a silly typo in commit #40979. Suffixes should be loaded correctly again

Browse source 
svn-id: r41018
This commit is contained in:
Filippos Karapetis 2009-05-30 09:07:28 +00:00
parent a6abd5c2fc
commit 4960b64b48
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/vocabulary.cpp
View file

@ -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();