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

svn-id: r39003

2 files changed, 2 insertions, 14 deletions

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 71a949fe88..349646ff21 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -361,7 +361,7 @@ void Sword2Engine::setupPersistentResources() {
 	_resman->openResource(CUR_PLAYER_ID);
 }
 
-Common::Error Sword2Engine::init() {
+Common::Error Sword2Engine::run() {
 	// Get some falling RAM and put it in your pocket, never let it slip
 	// away
 
@@ -445,10 +445,6 @@ Common::Error Sword2Engine::init() {
 
 	_screen->initialiseRenderCycle();
 
-	return Common::kNoError;
-}
-
-Common::Error Sword2Engine::go() {
 	while (1) {
 		if (_debugger->isAttached())
 			_debugger->onFrame();
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 946dc3df53..db1c075951 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -124,15 +124,7 @@ private:
 
 protected:
 	// 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 GUI::Debugger *getDebugger();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual void syncSoundSettings();