thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Rename the version of addAppropriateSources() used in detection

Browse source
This commit is contained in:
Filippos Karapetis 2014-10-18 15:02:32 +03:00
parent 17a77ff69c
commit fe3ed8ded2
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/detection.cpp
View file

@ -567,7 +567,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
return 0; return 0;
ResourceManager resMan; ResourceManager resMan;
resMan.addAppropriateSources(fslist); resMan.addAppropriateSourcesForDetection(fslist);
resMan.init(true); resMan.init(true);
// TODO: Add error handling. // TODO: Add error handling.

7
engines/sci/resource.cpp
View file

@ -88,9 +88,6 @@ const char *getSciVersionDesc(SciVersion version) {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#undef SCI_REQUIRE_RESOURCE_FILES
//#define SCI_VERBOSE_RESMAN 1 //#define SCI_VERBOSE_RESMAN 1
static const char *const s_errorDescriptions[] = { static const char *const s_errorDescriptions[] = {
@ -639,7 +636,7 @@ int ResourceManager::addAppropriateSources() {
return 1; return 1;
} }
int ResourceManager::addAppropriateSources(const Common::FSList &fslist) { int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fslist) {
ResourceSource *map = 0; ResourceSource *map = 0;
Common::Array<ResourceSource *> sci21Maps; 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)); debugC(1, kDebugLevelResMan, "resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
if ((_mapVersion == kResVersionUnknown) && (_volVersion == kResVersionUnknown)) { 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; _viewType = kViewUnknown;
return; return;
} }

9
engines/sci/resource.h
View file

@ -314,8 +314,15 @@ public:
*/ */
void init(bool initFromFallbackDetector = false); void init(bool initFromFallbackDetector = false);
/**
* Adds all of the resource files for a game
*/
int addAppropriateSources(); 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. * Looks up a resource's data.