[Scummvm-cvs-logs] SF.net SVN: scummvm:[39766] scummvm/trunk/engines/sci/scicore/resource.cpp

[thebluegr at users.sourceforge.net]

Revision: 39766
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39766&view=rev
Author:   thebluegr
Date:     2009-03-30 20:51:09 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/scicore/resource.cpp

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-03-30 14:06:07 UTC (rev 39765)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-03-30 20:51:09 UTC (rev 39766)
@@ -901,7 +901,10 @@
 			// 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);


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