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, 2 insertions, 10 deletions

diff --git a/base/main.cpp b/base/main.cpp
index 336607d657..c2b141966d 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -188,16 +188,8 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
 	// Inform backend that the engine is about to be run
 	system.engineInit();
 
-	// Init the engine (this might change the screen parameters)
-	// TODO: We should specify what return values
-	Common::Error result = engine->init();
-
-	// Run the game engine if the initialization was successful.
-	if (result == Common::kNoError) {
-		result = engine->go();
-	} else {
-		// TODO: Set an error flag, notify user about the problem
-	}
+	// Run the engine
+	Common::Error result = engine->run();
 
 	// Inform backend that the engine finished
 	system.engineDone();