[Scummvm-cvs-logs] SF.net SVN: scummvm:[41018] scummvm/trunk/engines/sci/vocabulary.cpp

[thebluegr at users.sourceforge.net]

Revision: 41018
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41018&view=rev
Author:   thebluegr
Date:     2009-05-30 09:07:28 +0000 (Sat, 30 May 2009)

Log Message:
-----------
Fixed a silly typo in commit #40979. Suffixes should be loaded correctly again

Modified Paths:
--------------
    scummvm/trunk/engines/sci/vocabulary.cpp

Modified: scummvm/trunk/engines/sci/vocabulary.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.cpp	2009-05-30 05:16:35 UTC (rev 41017)
+++ scummvm/trunk/engines/sci/vocabulary.cpp	2009-05-30 09:07:28 UTC (rev 41018)
@@ -226,10 +226,10 @@
 
 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 @@
 
 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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.