Engines: Fused several init&go methods into a single run method

svn-id: r39003

2 files changed, 2 insertions, 13 deletions

diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index cdb9bf1fed..5d79e0fb9a 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -81,7 +81,7 @@ ToucheEngine::~ToucheEngine() {
 	delete _midiPlayer;
 }
 
-Common::Error ToucheEngine::init() {
+Common::Error ToucheEngine::run() {
 	initGraphics(kScreenWidth, kScreenHeight, true);
 
 	Graphics::setupFont(_language);
@@ -93,10 +93,7 @@ Common::Error ToucheEngine::init() {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	return Common::kNoError;
-}
 
-Common::Error ToucheEngine::go() {
 	res_openDataFile();
 	res_allocateTables();
 	res_loadSpriteImage(18, _menuKitData);
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index eb42000872..3e85dde58d 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -370,15 +370,7 @@ public:
 	virtual ~ToucheEngine();
 
 	// Engine APIs
-	Common::Error init();
-	Common::Error go();
-	virtual Common::Error run() {
-		Common::Error err;
-		err = init();
-		if (err != Common::kNoError)
-			return err;
-		return go();
-	}
+	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void syncSoundSettings();