diff options
| author | Filippos Karapetis | 2014-10-18 15:02:32 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2014-10-18 16:03:49 +0300 |
| commit | fe3ed8ded270510a6233a2ca2376befeceeed0e4 (patch) | |
| tree | 51cbc18638c45cd0944d7bb8451d772a548ef564 /engines | |
| parent | 17a77ff69ced1c04e0520336c14e05fbf993108d (diff) | |
| download | scummvm-rg350-fe3ed8ded270510a6233a2ca2376befeceeed0e4.tar.gz scummvm-rg350-fe3ed8ded270510a6233a2ca2376befeceeed0e4.tar.bz2 scummvm-rg350-fe3ed8ded270510a6233a2ca2376befeceeed0e4.zip | |
SCI: Rename the version of addAppropriateSources() used in detection
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/resource.cpp | 7 | ||||
| -rw-r--r-- | engines/sci/resource.h | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 245b5646cc..7176a18b46 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -567,7 +567,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, return 0; ResourceManager resMan; - resMan.addAppropriateSources(fslist); + resMan.addAppropriateSourcesForDetection(fslist); resMan.init(true); // TODO: Add error handling. diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 17195c14b8..f690f03cac 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -88,9 +88,6 @@ const char *getSciVersionDesc(SciVersion version) { ////////////////////////////////////////////////////////////////////// - -#undef SCI_REQUIRE_RESOURCE_FILES - //#define SCI_VERBOSE_RESMAN 1 static const char *const s_errorDescriptions[] = { @@ -639,7 +636,7 @@ int ResourceManager::addAppropriateSources() { return 1; } -int ResourceManager::addAppropriateSources(const Common::FSList &fslist) { +int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fslist) { ResourceSource *map = 0; Common::Array<ResourceSource *> sci21Maps; @@ -890,7 +887,7 @@ void ResourceManager::init(bool initFromFallbackDetector) { debugC(1, kDebugLevelResMan, "resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion)); if ((_mapVersion == kResVersionUnknown) && (_volVersion == kResVersionUnknown)) { - warning("Volume and map version not detected, assuming that this is not a sci game"); + warning("Volume and map version not detected, assuming that this is not a SCI game"); _viewType = kViewUnknown; return; } diff --git a/engines/sci/resource.h b/engines/sci/resource.h index e90f52a3ce..8260ddb27e 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -314,8 +314,15 @@ public: */ void init(bool initFromFallbackDetector = false); + /** + * Adds all of the resource files for a game + */ int addAppropriateSources(); - int addAppropriateSources(const Common::FSList &fslist); // TODO: Switch from FSList to Common::Archive? + + /** + * Similar to the function above, only called from the fallback detector + */ + int addAppropriateSourcesForDetection(const Common::FSList &fslist); // TODO: Switch from FSList to Common::Archive? /** * Looks up a resource's data. |