[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.548,1.549

Andrew Kurushin h00ligan at users.sourceforge.net
Fri Jun 24 11:19:10 CEST 2005


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

Modified Files:
	scumm.cpp 
Log Message:
fix VS2005 _strnicmp error issue

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -d -r1.548 -r1.549
--- scumm.cpp	24 Jun 2005 15:23:17 -0000	1.548
+++ scumm.cpp	24 Jun 2005 18:17:01 -0000	1.549
@@ -2829,7 +2829,7 @@
 		num = filename[strlen(filename) - 2];
 
 	const char *ext = strrchr(filename, '.');
-	int len = ext - filename;
+	size_t len = (ext > 0) ? ext - filename : strlen(filename);	
 
 	for (int i = index; i < ARRAYSIZE(substResFileNameTable); i++) {
 		if (!scumm_strnicmp(filename, substResFileNameTable[i].winName, len)) {





More information about the Scummvm-git-logs mailing list