aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-12-09 12:32:47 +0000
committerMax Horn2009-12-09 12:32:47 +0000
commit5df86e4cccf294f6e4eccd08fb82c94fe3817a60 (patch)
tree72224e4ba090f128a535eb8641156f440311db6b
parent7bce8acd2e56eec870ffb7d269c6a8cb04af0735 (diff)
downloadscummvm-rg350-5df86e4cccf294f6e4eccd08fb82c94fe3817a60.tar.gz
scummvm-rg350-5df86e4cccf294f6e4eccd08fb82c94fe3817a60.tar.bz2
scummvm-rg350-5df86e4cccf294f6e4eccd08fb82c94fe3817a60.zip
SCI: Paranoia tweak for EngineState::autoDetectFeature
svn-id: r46306
-rw-r--r--engines/sci/engine/state.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 9a63b4e228..a46dcf35c9 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -235,7 +235,7 @@ Common::String EngineState::strSplit(const char *str, const char *sep) {
bool EngineState::autoDetectFeature(FeatureDetection featureDetection, int methodNum) {
Common::String objName;
- Selector slc;
+ Selector slc = 0;
reg_t objAddr;
bool foundTarget = false;
@@ -268,7 +268,8 @@ bool EngineState::autoDetectFeature(FeatureDetection featureDetection, int metho
objAddr = _segMan->findObjectByName(objName);
break;
default:
- break;
+ warning("autoDetectFeature: invalid featureDetection value %x", featureDetection);
+ return false;
}
reg_t addr;