Switched various Engine APIs to use Common::Error

svn-id: r34916

11 files changed, 33 insertions, 33 deletions

diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index a0213c0be3..bc5a59b7a9 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -219,7 +219,7 @@ void KyraEngine_HoF::pauseEngineIntern(bool pause) {
 	}
 }
 
-int KyraEngine_HoF::init() {
+Common::Error KyraEngine_HoF::init() {
 	_screen = new Screen_HoF(this, _system);
 	assert(_screen);
 	_screen->setResolution();
@@ -261,7 +261,7 @@ int KyraEngine_HoF::init() {
 
 	// No mouse display in demo
 	if (_flags.isDemo && !_flags.isTalkie)
-		return 0;
+		return Common::kNoError;
 
 	_res->exists("PWGMOUSE.SHP", true);
 	uint8 *shapes = _res->fileData("PWGMOUSE.SHP", 0);
@@ -273,10 +273,10 @@ int KyraEngine_HoF::init() {
 	delete[] shapes;
 
 	_screen->setMouseCursor(0, 0, getShapePtr(0));
-	return 0;
+	return Common::kNoError;
 }
 
-int KyraEngine_HoF::go() {
+Common::Error KyraEngine_HoF::go() {
 	if (_gameToLoad == -1) {
 		if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
 			seq_showStarcraftLogo();
@@ -326,7 +326,7 @@ int KyraEngine_HoF::go() {
 			seq_playSequences(kSequenceFunters, kSequenceFrash);
 	}
 
-	return 0;
+	return Common::kNoError;
 }
 
 void KyraEngine_HoF::startup() {
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index dc4161f0c1..62039cb80a 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -292,8 +292,8 @@ protected:
 	void seq_init();
 	void seq_uninit();
 
-	int init();
-	int go();
+	Common::Error init();
+	Common::Error go();
 
 	Screen_HoF *_screen;
 	TextDisplayer_HoF *_text;
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index e8db3467fc..e995c74fd2 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -155,7 +155,7 @@ KyraEngine_LoK::~KyraEngine_LoK() {
 		delete[] _sceneAnimTable[i];
 }
 
-int KyraEngine_LoK::init() {
+Common::Error KyraEngine_LoK::init() {
 	_screen = new Screen_LoK(this, _system);
 	assert(_screen);
 	_screen->setResolution();
@@ -284,10 +284,10 @@ int KyraEngine_LoK::init() {
 
 	_lastMusicCommand = 0;
 
-	return 0;
+	return Common::kNoError;
 }
 
-int KyraEngine_LoK::go() {
+Common::Error KyraEngine_LoK::go() {
 	if (_res->getFileSize("6.FNT"))
 		_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "8FAT.FNT");
@@ -304,7 +304,7 @@ int KyraEngine_LoK::go() {
 			setGameFlag(0xEF);
 			seq_intro();
 			if (shouldQuit())
-				return 0;
+				return Common::kNoError;
 			if (_skipIntroFlag && _abortIntroFlag)
 				resetGameFlag(0xEF);
 		}
@@ -312,7 +312,7 @@ int KyraEngine_LoK::go() {
 		resetGameFlag(0xEF);
 		mainLoop();
 	}
-	return 0;
+	return Common::kNoError;
 }
 
 
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index e6fc0dc774..c345dd4df8 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -144,8 +144,8 @@ public:
 	const uint8 * const*palTable2() { return &_specialPalettes[29]; }
 
 protected:
-	virtual int go();
-	virtual int init();
+	virtual Common::Error go();
+	virtual Common::Error init();
 
 public:
 	// sequences
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 7dea56a5fa..c461bfa494 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -202,7 +202,7 @@ KyraEngine_MR::~KyraEngine_MR() {
 	delete _album.rightPage.wsa;
 }
 
-int KyraEngine_MR::init() {
+Common::Error KyraEngine_MR::init() {
 	_screen = new Screen_MR(this, _system);
 	assert(_screen);
 	_screen->setResolution();
@@ -233,10 +233,10 @@ int KyraEngine_MR::init() {
 	_res->loadFileToBuf("PALETTE.COL", _screen->getPalette(0), 768);
 	_screen->setScreenPalette(_screen->getPalette(0));
 
-	return 0;
+	return Common::kNoError;
 }
 
-int KyraEngine_MR::go() {
+Common::Error KyraEngine_MR::go() {
 	bool running = true;
 	preinit();
 	_screen->hideMouse();
@@ -324,7 +324,7 @@ int KyraEngine_MR::go() {
 	if (_showOutro)
 		playVQA("CREDITS");
 
-	return 0;
+	return Common::kNoError;
 }
 
 void KyraEngine_MR::initMainMenu() {
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index a6fb9af20c..0bf5e663b4 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -62,7 +62,7 @@ public:
 	int language() const { return _lang; }
 	bool heliumMode() const { return _configHelium; }
 
-	int go();
+	Common::Error go();
 
 	void playVQA(const char *name);
 
@@ -84,7 +84,7 @@ private:
 	Screen_MR *_screen;
 	SoundDigital *_soundDigital;
 
-	int init();
+	Common::Error init();
 
 	void preinit();
 	void startup();
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 0d398f6c64..11a303c27a 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -92,7 +92,7 @@ void KyraEngine_v1::pauseEngineIntern(bool pause) {
 	_timer->pause(pause);
 }
 
-int KyraEngine_v1::init() {
+Common::Error KyraEngine_v1::init() {
 	registerDefaultSettings();
 
 	// Setup mixer
@@ -186,7 +186,7 @@ int KyraEngine_v1::init() {
 	// Prevent autosave on game startup
 	_lastAutosave = _system->getMillis();
 
-	return 0;
+	return Common::kNoError;
 }
 
 KyraEngine_v1::~KyraEngine_v1() {
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 81eea7420c..f85ddade50 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -168,7 +168,7 @@ public:
 
 protected:
 	// Engine APIs
-	virtual int init();
+	virtual Common::Error init();
 	virtual ::GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void pauseEngineIntern(bool pause);
@@ -304,7 +304,7 @@ protected:
 
 	static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *file, bool loadThumbnail, SaveHeader &header);
 
-	int loadGameState(int slot);
+	Common::Error loadGameState(int slot);
 	virtual void loadGame(const char *fileName) = 0;
 	virtual void saveGame(const char *fileName, const char *saveName, const Graphics::Surface *thumbnail) = 0;
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 91c9b65d1e..0b1a63ecf6 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -74,7 +74,7 @@ Screen *LoLEngine::screen() {
 	return _screen;
 }
 
-int LoLEngine::init() {
+Common::Error LoLEngine::init() {
 	_screen = new Screen_LoL(this, _system);
 	assert(_screen);
 	_screen->setResolution();
@@ -90,10 +90,10 @@ int LoLEngine::init() {
 	if (!_sound->init())
 		error("Couldn't init sound");
 
-	return 0;
+	return Common::kNoError;
 }
 
-int LoLEngine::go() {
+Common::Error LoLEngine::go() {
 	setupPrologueData(true);
 	showIntro();
 	_sound->playTrack(6);
@@ -102,7 +102,7 @@ int LoLEngine::go() {
 	_screen->fadeToBlack();
 	setupPrologueData(false);
 
-	return 0;
+	return Common::kNoError;
 }
 
 #pragma mark - Input
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 71d184f062..3ece9b28a4 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -47,8 +47,8 @@ private:
 	Screen_LoL *_screen;
 	TIMInterpreter *_tim;
 
-	int init();
-	int go();
+	Common::Error init();
+	Common::Error go();
 
 	// input
 	void updateInput();
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index e85346a9ba..5f94c1321d 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -244,14 +244,14 @@ bool KyraEngine_v1::saveFileLoadable(int slot) {
 	return false;
 }
 
-int KyraEngine_v1::loadGameState(int slot) {
+Common::Error KyraEngine_v1::loadGameState(int slot) {
 	if (!_isSaveAllowed)
-		return -1;
+		return Common::kUnknownError;	// FIXME
 	
 	const char *filename = getSavegameFilename(slot);
 	loadGame(filename);
 
-	return 0;
+	return Common::kNoError;
 }
 
 void KyraEngine_v1::checkAutosave() {