[Scummvm-cvs-logs] SF.net SVN: scummvm: [20898] scummvm/trunk/engines/scumm

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Feb 25 13:37:04 CET 2006


Revision: 20898
Author:   fingolfin
Date:     2006-02-25 13:36:19 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20898&view=rev

Log Message:
-----------
Remove the dummy index 0 entry from substResFileNameTable

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/scumm/resource.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-02-25 21:25:09 UTC (rev 20897)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-02-25 21:36:19 UTC (rev 20898)
@@ -996,7 +996,7 @@
 
 			int substLastIndex = 0;
 
-			while (substLastIndex != -1) {
+			do {
 				// Iterate over all files in the given directory
 				for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 					if (!file->isDirectory()) {
@@ -1166,9 +1166,9 @@
 					}
 				}
 
-				substLastIndex = findSubstResFileName(subst, tempName, substLastIndex + 1);
+				substLastIndex = findSubstResFileName(subst, tempName, substLastIndex);
 				applySubstResFileName(subst, tempName, detectName, sizeof(detectName));
-			}
+			} while (subst.winName != 0);
 		}
 	}
 
@@ -1272,7 +1272,7 @@
 		strcpy(tempName, detectName);
 
 		int substLastIndex = 0;
-		while (substLastIndex != -1) {
+		do {
 			// FIXME: Repeatedly calling File::exists like this is a bad idea.
 			// Instead, use the fs.h code to get a list of all files in that 
 			// directory and simply check whether that filename is contained 
@@ -1282,11 +1282,12 @@
 				break;
 			}
 
-			substLastIndex = findSubstResFileName(subst, tempName, substLastIndex + 1);
+			substLastIndex = findSubstResFileName(subst, tempName, substLastIndex);
 			applySubstResFileName(subst, tempName, detectName, sizeof(detectName));
-		}
+		} while (subst.winName != 0);
+
 		if (found) {
-			if (substLastIndex != 0)
+			if (subst.winName != 0)
 				debug(5, "Generated filename substitute: %s -> %s", tempName, detectName);
 			break;
 		}

Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2006-02-25 21:25:09 UTC (rev 20897)
+++ scummvm/trunk/engines/scumm/resource.cpp	2006-02-25 21:36:19 UTC (rev 20898)
@@ -258,13 +258,13 @@
 			if (_substResFileNameBundle.winName == 0) {
 				int substLastIndex = 0;
 
-				while (substLastIndex != -1) {
+				do {
 					if (file.openSubFile(name))
 						break;
 
-					substLastIndex = findSubstResFileName(_substResFileNameBundle, filename, substLastIndex + 1);
+					substLastIndex = findSubstResFileName(_substResFileNameBundle, filename, substLastIndex);
 					applySubstResFileName(_substResFileNameBundle, filename, name, sizeof(name));
-				}
+				} while (_substResFileNameBundle.winName != 0);
 
 				if (_substResFileNameBundle.winName != 0) {
 					debug(5, "Generated substitute in Mac bundle: [%s -> %s]", filename, _substResFileNameBundle.winName);

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-25 21:25:09 UTC (rev 20897)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-25 21:36:19 UTC (rev 20898)
@@ -79,7 +79,6 @@
 
 
 static SubstResFileNames substResFileNameTable[] = {
-	{ "Intentionally/left/blank", "", kGenMacNoParens },
 	{ "00.LFL", "Maniac Mansion (E).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (F).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs },
@@ -350,7 +349,7 @@
 }
 
 int findSubstResFileName(SubstResFileNames &subst, const char *filename, int index) {
-	if (index <= 0)
+	if (index < 0)
 		return -1;
 
 	size_t len = strlen(filename);
@@ -370,7 +369,7 @@
 	for (i = index; substResFileNameTable[i].winName; i++) {
 		if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) {
 			subst = substResFileNameTable[i];
-			return i;
+			return i+1;
 		}
 	}
 	subst = substResFileNameTable[i];







More information about the Scummvm-git-logs mailing list