aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2006-02-25 21:36:19 +0000
committerMax Horn2006-02-25 21:36:19 +0000
commita76e3bab2fc5f69eebedf5aa883050bfccc82353 (patch)
tree12d49153bd25f816d10f3007aed0cced447ec082 /engines/scumm/resource.cpp
parent1d9693f35b03ca5ecc85de3d6af87ea64c1b2c9c (diff)
downloadscummvm-rg350-a76e3bab2fc5f69eebedf5aa883050bfccc82353.tar.gz
scummvm-rg350-a76e3bab2fc5f69eebedf5aa883050bfccc82353.tar.bz2
scummvm-rg350-a76e3bab2fc5f69eebedf5aa883050bfccc82353.zip
Remove the dummy index 0 entry from substResFileNameTable
svn-id: r20898
Diffstat (limited to 'engines/scumm/resource.cpp')
-rw-r--r--engines/scumm/resource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 7e98b6bf43..cd51174170 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -258,13 +258,13 @@ bool ScummEngine::openFile(BaseScummFile &file, const char *filename, bool resou
if (_substResFileNameBundle.winName == 0) {
int substLastIndex = 0;
- while (substLastIndex != -1) {
+ do {
if (file.openSubFile(name))
break;
- substLastIndex = findSubstResFileName(_substResFileNameBundle, filename, substLastIndex + 1);
+ substLastIndex = findSubstResFileName(_substResFileNameBundle, filename, substLastIndex);
applySubstResFileName(_substResFileNameBundle, filename, name, sizeof(name));
- }
+ } while (_substResFileNameBundle.winName != 0);
if (_substResFileNameBundle.winName != 0) {
debug(5, "Generated substitute in Mac bundle: [%s -> %s]", filename, _substResFileNameBundle.winName);