aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2010-06-20 23:41:54 +0000
committerMatthew Hoops2010-06-20 23:41:54 +0000
commit473ae1c11efd6833fd0a9172b9fc54ee6ef66211 (patch)
treedff9d30e1dcbc225607ab25d6bc986c375c07bd7
parent72534afea9696316c61c2b647f87638a34c2f57e (diff)
downloadscummvm-rg350-473ae1c11efd6833fd0a9172b9fc54ee6ef66211.tar.gz
scummvm-rg350-473ae1c11efd6833fd0a9172b9fc54ee6ef66211.tar.bz2
scummvm-rg350-473ae1c11efd6833fd0a9172b9fc54ee6ef66211.zip
Cleaner fix for the QFG4 demo audio map problem.
svn-id: r50104
-rw-r--r--engines/sci/resource.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index acb7d46127..718c675db1 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1247,14 +1247,11 @@ void ResourceManager::readResourcePatches() {
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);