Added Engine::init() method; added return value to Engine::go()

svn-id: r15865

2 files changed, 8 insertions, 10 deletions

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index f8abc97773..7df2d8d8ec 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -972,16 +972,11 @@ ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, cons
 	_heSndSoundFreq = 0;
 }
 
-void ScummEngine::go() {
-	mainInit();
-	mainRun();
-}
-
 #pragma mark -
 #pragma mark --- Initialization ---
 #pragma mark -
 
-void ScummEngine::mainInit() {
+int ScummEngine::init() {
 
 	// Initialize backend
 	_system->initSize(_screenWidth, _screenHeight);
@@ -1119,6 +1114,8 @@ void ScummEngine::mainInit() {
 	} else {
 		_saveLoadFlag = 0;
 	}
+
+	return 0;
 }
 
 void ScummEngine::scummInit() {
@@ -1397,7 +1394,7 @@ void ScummEngine::setupMusic(int midi) {
 #pragma mark --- Main loop ---
 #pragma mark -
 
-void ScummEngine::mainRun() {
+int ScummEngine::go() {
 	int delta = 0;
 	int diff = _system->getMillis();
 
@@ -1418,6 +1415,8 @@ void ScummEngine::mainRun() {
 			// TODO: Maybe perform an autosave on exit?
 		}
 	}
+	
+	return 0;
 }
 
 void ScummEngine::waitForTimer(int msec_delay) {
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 881a7bf6e4..43b7728958 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -385,10 +385,10 @@ public:
 	virtual ~ScummEngine();
 
 	/** Startup function: Calls mainInit and then mainRun. */
-	void go();
+	int go();
 
 	// Init functions
-	void mainInit();
+	int init();
 
 	virtual void setupScummVars();
 	void initScummVars();
@@ -399,7 +399,6 @@ public:
 	void setupMusic(int midi);
 
 	// Scumm main loop
-	void mainRun();
 	int scummLoop(int delta);
 
 	// Event handling