[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.596,1.597

[Eugene Sandulenko]

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

Modified Files:
	scumm.cpp 
Log Message:
o Add fate to obsolete targets. It was just an oversight
o Make generateSubstResFileName more portable. I wonder how it worked in
  the past at all.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -d -r1.596 -r1.597
--- scumm.cpp	12 Oct 2005 19:45:35 -0000	1.596
+++ scumm.cpp	12 Oct 2005 22:52:47 -0000	1.597
@@ -125,6 +125,7 @@
 	{"digdemo", "dig", NULL},
 	{"digdemoMac", "dig", "macintosh"},
 	{"dottdemo", "tentacle", NULL},
+	{"fate", "atlantis", NULL},
 	{"ftMac", "ft",  "macintosh"},
 	{"ftpcdemo", "ft", NULL},
 	{"ftdemo", "ft",  "macintosh"},
@@ -2987,8 +2988,10 @@
 	if (num == ')')
 		num = filename[strlen(filename) - 2];
 
-	const char *ext = strrchr(filename, '.');
-	size_t len = ((int)ext > 0) ? ext - filename : strlen(filename);
+	const char *ext = NULL;
+
+	ext = strrchr(filename, '.');
+	size_t len = (ext != NULL) ? ext - filename : strlen(filename);
 
 	for (int i = index; i < ARRAYSIZE(substResFileNameTable); i++) {
 		if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) {