Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors

svn-id: r39002

1 files changed, 16 insertions, 7 deletions

diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h
index 7a76248cf3..5407d0b174 100644
--- a/engines/groovie/groovie.h
+++ b/engines/groovie/groovie.h
@@ -74,20 +74,29 @@ public:
 	~GroovieEngine();
 
 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();
+	}
 
-	void errorString(const char *buf_input, char *buf_output, int buf_output_size);
+	virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
 
-public:
-	bool hasFeature(EngineFeature f) const;
+	virtual bool hasFeature(EngineFeature f) const;
 
-	bool canLoadGameStateCurrently();
-	Common::Error loadGameState(int slot);
-	void syncSoundSettings();
+	virtual bool canLoadGameStateCurrently();
+	virtual Common::Error loadGameState(int slot);
+	virtual void syncSoundSettings();
 
-	Debugger *getDebugger() { return _debugger; }
+	virtual Debugger *getDebugger() { return _debugger; }
 
+public:
 	void waitForInput();
 
 	Script _script;