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

SCI: Don't error() out when autodetection fails

Browse source 
svn-id: r48790
This commit is contained in:
Walter van Niftrik 2010-04-24 22:02:31 +00:00
parent 194bdd9b83
commit 725fb248ea
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/sci/engine/features.cpp
View file

@ -71,6 +71,9 @@ bool GameFeatures::autoDetectSoundType() {
// Look up the script address
reg_t addr = getDetectionAddr("Sound", _kernel->_selectorCache.play);
if (!addr.segment)
return false;
uint16 offset = addr.offset;
Script *script = _segMan->getScript(addr.segment);
uint16 intParam = 0xFFFF;
@ -206,6 +209,9 @@ bool GameFeatures::autoDetectLofsType(int methodNum) {
// Look up the script address
reg_t addr = getDetectionAddr("Game", -1, methodNum);
if (!addr.segment)
return false;
uint16 offset = addr.offset;
Script *script = _segMan->getScript(addr.segment);
@ -289,6 +295,9 @@ bool GameFeatures::autoDetectGfxFunctionsType(int methodNum) {
// Look up the script address
reg_t addr = getDetectionAddr("Rm", _kernel->_selectorCache.overlay, methodNum);
if (!addr.segment)
return false;
uint16 offset = addr.offset;
Script *script = _segMan->getScript(addr.segment);
@ -379,6 +388,9 @@ bool GameFeatures::autoDetectSci21KernelType() {
// Look up the script address
reg_t addr = getDetectionAddr("Sound", _kernel->_selectorCache.play);
if (!addr.segment)
return false;
uint16 offset = addr.offset;
Script *script = _segMan->getScript(addr.segment);
@ -428,6 +440,9 @@ bool GameFeatures::autoDetectMoveCountType() {
// Look up the script address
reg_t addr = getDetectionAddr("Motion", _kernel->_selectorCache.doit);
if (!addr.segment)
return false;
uint16 offset = addr.offset;
Script *script = _segMan->getScript(addr.segment);
bool foundTarget = false;