[Scummvm-cvs-logs] SF.net SVN: scummvm:[50104] scummvm/trunk/engines/sci/resource.cpp

[mthreepwood at users.sourceforge.net]

Revision: 50104
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50104&view=rev
Author:   mthreepwood
Date:     2010-06-20 23:41:54 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
Cleaner fix for the QFG4 demo audio map problem.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-20 22:45:09 UTC (rev 50103)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-20 23:41:54 UTC (rev 50104)
@@ -1247,14 +1247,11 @@
 			bool bAdd = false;
 			name = (*x)->getName();
 
-			// HACK: Skip broken map in QFG4 Demo
-			if (name.equalsIgnoreCase("65535x.map"))
-				continue;
-
 			// SCI1 scheme
 			if (isdigit(name[0])) {
-				resourceNr = atoi(name.c_str());
-				bAdd = true;
+				char *end = 0;
+				resourceNr = strtol(name.c_str(), &end, 10);
+				bAdd = (*end == '.'); // Ensure the next character is the period
 			} else {
 				// SCI0 scheme
 				int resname_len = strlen(szResType);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.