[Scummvm-cvs-logs] SF.net SVN: scummvm:[46306] scummvm/trunk/engines/sci/engine/state.cpp

[fingolfin at users.sourceforge.net]

Revision: 46306
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46306&view=rev
Author:   fingolfin
Date:     2009-12-09 12:32:47 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
SCI: Paranoia tweak for EngineState::autoDetectFeature

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.cpp

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-12-09 09:31:07 UTC (rev 46305)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-12-09 12:32:47 UTC (rev 46306)
@@ -235,7 +235,7 @@
 
 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 @@
 		objAddr = _segMan->findObjectByName(objName);
 		break;
 	default:
-		break;
+		warning("autoDetectFeature: invalid featureDetection value %x", featureDetection);
+		return false;
 	}
 
 	reg_t addr;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.