[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.321,1.322

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5116

Modified Files:
	scumm.cpp 
Log Message:
Renamed substDataFileNames to substResFileNames. Just forgot to do it last
time.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- scumm.cpp	11 Feb 2005 08:17:23 -0000	1.321
+++ scumm.cpp	11 Feb 2005 13:29:15 -0000	1.322
@@ -451,11 +451,11 @@
 	kGenPC
 };
 
-static struct substDataFileNames {
+static struct substResFileNames {
 	const char *winName;
 	const char *macName;
 	int genMethod;
-} substDataFileNameTable[] = {
+} substResFileNameTable[] = {
 	{ "Intentionally/left/blank", "", kGenMacNoParens},
 	{ "racedemo", "500demo", kGenPC},
 	{ "Spydemo", "foxdemo", kGenPC},
@@ -2696,8 +2696,8 @@
 					if (0 == scumm_stricmp(detectName, name)) {
 						// Match found, add to list of candidates, then abort inner loop.
 						if (substLastIndex > 0 && // HE Mac versions.
-							(substDataFileNameTable[substLastIndex].genMethod == kGenMac ||
-							 substDataFileNameTable[substLastIndex].genMethod == kGenMacNoParens)) {
+							(substResFileNameTable[substLastIndex].genMethod == kGenMac ||
+							 substResFileNameTable[substLastIndex].genMethod == kGenMacNoParens)) {
 							detectedGames.push_back(DetectedGame(g->toGameSettings(), 
 																 Common::UNK_LANG, 
 																 Common::kPlatformMacintosh));
@@ -2789,24 +2789,24 @@
 	if (index > 0)
 		cont = index;
 
-	for (int i = cont; i < ARRAYSIZE(substDataFileNameTable); i++) {
-		if (!scumm_strnicmp(filename, substDataFileNameTable[i].winName, len)) {
-			switch (substDataFileNameTable[i].genMethod) {
+	for (int i = cont; i < ARRAYSIZE(substResFileNameTable); i++) {
+		if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) {
+			switch (substResFileNameTable[i].genMethod) {
 			case kGenMac:
 			case kGenMacNoParens:
 				if (num == '3') { // special case for cursors
 					// For mac they're stored in game binary
-					strncpy(buf, substDataFileNameTable[i].macName, bufsize);
+					strncpy(buf, substResFileNameTable[i].macName, bufsize);
 				} else {
-					if (substDataFileNameTable[i].genMethod == kGenMac)
-						snprintf(buf, bufsize, "%s (%c)", substDataFileNameTable[i].macName, num);
+					if (substResFileNameTable[i].genMethod == kGenMac)
+						snprintf(buf, bufsize, "%s (%c)", substResFileNameTable[i].macName, num);
 					else 
-						snprintf(buf, bufsize, "%s %c", substDataFileNameTable[i].macName, num);
+						snprintf(buf, bufsize, "%s %c", substResFileNameTable[i].macName, num);
 				}
 				break;
 
 			case kGenPC:
-				snprintf(buf, bufsize, "%s%s", substDataFileNameTable[i].macName, ext);
+				snprintf(buf, bufsize, "%s%s", substResFileNameTable[i].macName, ext);
 				break;
 
 			default:
@@ -2874,8 +2874,8 @@
 
 	// Force game to have Mac platform if needed
 	if (substLastIndex > 0) {
-		if (substDataFileNameTable[substLastIndex].genMethod == kGenMac ||
-			substDataFileNameTable[substLastIndex].genMethod == kGenMacNoParens)
+		if (substResFileNameTable[substLastIndex].genMethod == kGenMac ||
+			substResFileNameTable[substLastIndex].genMethod == kGenMacNoParens)
 			game.features |= GF_MACINTOSH;
 	}