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

svn-id: r39003

2 files changed, 4 insertions, 16 deletions

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index dc11d29f55..51b7d30fbe 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -110,12 +110,6 @@ GobEngine::~GobEngine() {
 	delete[] _startTot0;
 }
 
-Common::Error GobEngine::go() {
-	_init->initGame(0);
-
-	return Common::kNoError;
-}
-
 const char *GobEngine::getLangDesc(int16 language) const {
 	if ((language < 0) || (language > 10))
 		language = 2;
@@ -177,7 +171,7 @@ bool GobEngine::hasAdlib() const {
 	return (_features & kFeaturesAdlib) != 0;
 }
 
-Common::Error GobEngine::init() {
+Common::Error GobEngine::run() {
 	if (!initGameParts()) {
 		GUIErrorMessage("GobEngine::init(): Unknown version of game engine");
 		return Common::kUnknownError;
@@ -255,6 +249,8 @@ Common::Error GobEngine::init() {
 	}
 	_global->_languageWanted = _global->_language;
 
+	_init->initGame(0);
+
 	return Common::kNoError;
 }
 
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 9a00e8b8fe..6500c7f2a7 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -191,15 +191,7 @@ private:
 	uint32 _pauseStart;
 
 	// 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 pauseEngineIntern(bool pause);