Switched various Engine APIs to use Common::Error

svn-id: r34916

5 files changed, 23 insertions, 24 deletions

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 6ca3406230..e4694cf68b 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -794,18 +794,18 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 	// Fetch the list of files in the current directory
 	Common::FSList fslist;
 	Common::FSNode dir(ConfMan.get("path"));
-	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
+	if (!dir.isDirectory())
 		return Common::kInvalidPathError;
-	}
+	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly))
+		return Common::kNoGameDataFoundError;
 
 	// Invoke the detector, but fixed to the specified gameid.
 	Common::List<DetectorResult> results;
 	::detectGames(fslist, results, gameid);
 
 	// Unable to locate game data
-	if (results.empty()) {
+	if (results.empty())
 		return Common::kNoGameDataFoundError;
-	}
 
 	// No unique match found. If a platform override is present, try to
 	// narrow down the list a bit more.
@@ -831,9 +831,8 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 	}
 
 	// Still no unique match found -> print a warning
-	if (results.size() > 1) {
+	if (results.size() > 1)
 		warning("Engine_SCUMM_create: No unique game candidate found, using first one");
-	}
 
 	// Simply use the first match
 	DetectorResult res(*(results.begin()));
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 8fd9122503..3b9bd40b17 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -669,8 +669,8 @@ public:
 	ScummEngine_vCUPhe(OSystem *syst, const DetectorResult &dr);
 	~ScummEngine_vCUPhe();
 
-	int init();
-	int go();
+	Common::Error init();
+	Common::Error go();
 
 	void parseEvents();
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index bb8a6bac65..069302482c 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -75,9 +75,9 @@ struct SaveInfoSection {
 
 #pragma mark -
 
-int ScummEngine::loadGameState(int slot) {
+Common::Error ScummEngine::loadGameState(int slot) {
 	requestLoad(slot);
-	return 0;
+	return Common::kNoError;
 }
 
 bool ScummEngine::canLoadGameStateCurrently() {
@@ -85,9 +85,9 @@ bool ScummEngine::canLoadGameStateCurrently() {
 	return true;
 }
 
-int ScummEngine::saveGameState(int slot, const char *desc) {
+Common::Error ScummEngine::saveGameState(int slot, const char *desc) {
 	requestSave(slot, desc);
-	return 0;
+	return Common::kNoError;
 }
 
 bool ScummEngine::canSaveGameStateCurrently() {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index bb22ee6381..8ee880691b 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -821,21 +821,21 @@ ScummEngine_vCUPhe::~ScummEngine_vCUPhe() {
 	delete _cupPlayer;
 }
 
-int ScummEngine_vCUPhe::init() {
+Common::Error ScummEngine_vCUPhe::init() {
 	_system->beginGFXTransaction();
 		_system->initSize(CUP_Player::kDefaultVideoWidth, CUP_Player::kDefaultVideoHeight);
 		initCommonGFX(true);
 	_system->endGFXTransaction();
 
-	return 0;
+	return Common::kNoError;
 }
 
-int ScummEngine_vCUPhe::go() {
+Common::Error ScummEngine_vCUPhe::go() {
 	if (_cupPlayer->open(_filenamePattern.pattern)) {
 		_cupPlayer->play();
 		_cupPlayer->close();
 	}
-	return 0;
+	return Common::kNoError;
 }
 
 void ScummEngine_vCUPhe::parseEvents() {
@@ -907,7 +907,7 @@ ScummEngine_v8::~ScummEngine_v8() {
 #pragma mark --- Initialization ---
 #pragma mark -
 
-int ScummEngine::init() {
+Common::Error ScummEngine::init() {
 
 	// Add default file directories.
 	if (((_game.platform == Common::kPlatformAmiga) || (_game.platform == Common::kPlatformAtariST)) && (_game.version <= 4)) {
@@ -1106,7 +1106,7 @@ int ScummEngine::init() {
 
 	syncSoundSettings();
 
-	return 0;
+	return Common::kNoError;
 }
 
 void ScummEngine::setupScumm() {
@@ -1712,7 +1712,7 @@ int ScummEngine::getTalkDelay() {
 #pragma mark --- Main loop ---
 #pragma mark -
 
-int ScummEngine::go() {
+Common::Error ScummEngine::go() {
 	_engineStartTime = _system->getMillis() / 1000;
 
 	// If requested, load a save game instead of running the boot script
@@ -1763,7 +1763,7 @@ int ScummEngine::go() {
 		}
 	}
 
-	return 0;
+	return Common::kNoError;
 }
 
 void ScummEngine::waitForTimer(int msec_delay) {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 80f5784351..582d9fdf60 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -443,16 +443,16 @@ public:
 	virtual ~ScummEngine();
 
 	// Engine APIs
-	virtual int init();
-	virtual int go();
+	virtual Common::Error init();
+	virtual Common::Error go();
 	virtual void errorString(const char *buf_input, char *buf_output);
 	virtual GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void syncSoundSettings();
 
-	virtual int loadGameState(int slot);
+	virtual Common::Error loadGameState(int slot);
 	virtual bool canLoadGameStateCurrently();
-	virtual int saveGameState(int slot, const char *desc);
+	virtual Common::Error saveGameState(int slot, const char *desc);
 	virtual bool canSaveGameStateCurrently();
 
 	virtual void pauseEngineIntern(bool pause);