[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.711,1.712

Gregory Montoir cyx at users.sourceforge.net
Fri Jan 27 15:11:00 CET 2006


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

Modified Files:
	scumm.cpp 
Log Message:
A filename without an extension can be passed to generateSubstResFileName()  ; changed assert() condition accordingly.

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -d -r1.711 -r1.712
--- scumm.cpp	27 Jan 2006 19:33:40 -0000	1.711
+++ scumm.cpp	27 Jan 2006 23:10:24 -0000	1.712
@@ -3184,7 +3184,7 @@
 		return -1;
 
 	size_t len = strlen(filename);
-	assert(len >= 5);
+	assert(len > 0);
 
 	char num = filename[len - 1];
 
@@ -3192,9 +3192,7 @@
 	if (num == ')')
 		num = filename[len - 2];
 
-	const char *ext = NULL;
-
-	ext = strrchr(filename, '.');
+	const char *ext = strrchr(filename, '.');
 	if (ext)
 		len = ext - filename;
 





More information about the Scummvm-git-logs mailing list