SCI: fixed detection to not crash when adding sierras pinball creep, also changed detection so that we dont "accept" games that use unknown view resources (otherwise pinball creep will get detected as SCI)

svn-id: r47348
This commit is contained in:
Martin Kiewitz 2010-01-17 22:32:53 +00:00
parent fb178c0a62
commit 055e17b60e
2 changed files with 8 additions and 1 deletions

View File

@ -273,7 +273,9 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl
if (gameViews == kViewUnknown) {
SearchMan.remove("SCI_detection");
delete resMan;
return (const ADGameDescription *)&s_fallbackDesc;
// Can't be SCI (or unsupported SCI views). Pinball Creep by sierra also uses resource.map/resource.000 files
// but doesnt share sci format at all, if we dont return 0 here we will detect this game as SCI
return 0;
}
#ifndef ENABLE_SCI32

View File

@ -575,6 +575,11 @@ void ResourceManager::init() {
debugC(1, kDebugLevelResMan, "resMan: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
debugC(1, kDebugLevelResMan, "resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
if ((_mapVersion == kResVersionUnknown) && (_volVersion == kResVersionUnknown)) {
_viewType = kViewUnknown;
return;
}
scanNewSources();
addInternalSources();
scanNewSources();