diff options
| author | Max Horn | 2009-02-21 22:40:58 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 22:40:58 +0000 |
| commit | d6e397233f7abb76b60bae6c4a0dc8052c1b3e17 (patch) | |
| tree | 7317dc926c815e2dfb5a06ee5df0de1fe7bf54d2 /engines/sci/scicore | |
| parent | 41b1f19a5da839ce5aaf6d433d6a85557ad2bc77 (diff) | |
| download | scummvm-rg350-d6e397233f7abb76b60bae6c4a0dc8052c1b3e17.tar.gz scummvm-rg350-d6e397233f7abb76b60bae6c4a0dc8052c1b3e17.tar.bz2 scummvm-rg350-d6e397233f7abb76b60bae6c4a0dc8052c1b3e17.zip | |
SCI: More cleanup
svn-id: r38758
Diffstat (limited to 'engines/sci/scicore')
| -rw-r--r-- | engines/sci/scicore/resource.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/scicore/resource_map.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index d12d261c01..5f2e2ce277 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -396,7 +396,7 @@ static int _scir_scan_new_sources(ResourceManager *mgr, int *detected_version, R return NULL; } if (resource_error == SCI_ERROR_RESMAP_NOT_FOUND) { - // fixme: Try reading w/o resource.map + // FIXME: Try reading w/o resource.map resource_error = SCI_ERROR_NO_RESOURCE_FILES_FOUND; } @@ -414,7 +414,7 @@ static int _scir_scan_new_sources(ResourceManager *mgr, int *detected_version, R resource_error = sci1_read_resource_map(mgr, source, scir_get_volume(mgr, source, 0), &mgr->_resources, &mgr->_resourcesNr, detected_version); if (resource_error == SCI_ERROR_RESMAP_NOT_FOUND) { - // fixme: Try reading w/o resource.map + // FIXME: Try reading w/o resource.map resource_error = SCI_ERROR_NO_RESOURCE_FILES_FOUND; } diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp index c30525584a..93129f193d 100644 --- a/engines/sci/scicore/resource_map.cpp +++ b/engines/sci/scicore/resource_map.cpp @@ -106,10 +106,7 @@ static int detect_odd_sci01(Common::File &file) { if (read_ok) { sprintf(filename, "resource.%03i", SCI0_RESFILE_GET_FILE(buf + 2)); - Common::File temp; - - // FIXME: Maybe better to use File::exists here? - if (!temp.open(filename)) { + if (!Common::File::exists(filename)) { files_ok = 0; break; } |