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

svn-id: r39003

2 files changed, 4 insertions, 17 deletions

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index ff3c8c4e79..487e3378de 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -170,7 +170,7 @@ SciEngine::~SciEngine() {
 	delete _console;
 }
 
-Common::Error SciEngine::init() {
+Common::Error SciEngine::run() {
 	initGraphics(320, 200, false);
 
 	// Create debugger console. It requires GFX to be initialized
@@ -178,11 +178,6 @@ Common::Error SciEngine::init() {
 
 	// Additional setup.
 	printf("SciEngine::init\n");
-	return Common::kNoError;
-}
-
-Common::Error SciEngine::go() {
-	// Your main even loop should be (invoked from) here.
 
 	/* bool end = false;
 	Common::EventManager *em = _system->getEventManager();
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 0f10df0c16..480ec66ee8 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -76,17 +76,9 @@ public:
 	SciEngine(OSystem *syst, const SciGameDescription *desc);
 	~SciEngine();
 
-	Common::Error init();
-	Common::Error go();
-	virtual Common::Error run() {
-		Common::Error err;
-		err = init();
-		if (err != Common::kNoError)
-			return err;
-		return go();
-	}
-
-	GUI::Debugger *getDebugger() { return _console; }
+	// Engine APIs
+	virtual Common::Error run();
+	virtual GUI::Debugger *getDebugger() { return _console; }
 
 	const char* getGameID() const;
 	int getResourceVersion() const;