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

svn-id: r15865

2 files changed, 11 insertions, 10 deletions

diff --git a/queen/queen.cpp b/queen/queen.cpp
index 93f2e70e35..998e0cb501 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -288,12 +288,7 @@ void QueenEngine::errorString(const char *buf1, char *buf2) {
 	strcpy(buf2, buf1);
 }
 
-void QueenEngine::go() {
-	initialise();
-
-	registerDefaultSettings();
-	readOptionSettings();
-
+int QueenEngine::go() {
 	_logic->oldRoom(0);
 	_logic->newRoom(_logic->currentRoom());
 
@@ -319,9 +314,11 @@ void QueenEngine::go() {
 			}
 		}
 	}
+	
+	return 0;
 }
 
-void QueenEngine::initialise(void) {
+int QueenEngine::init() {
 	_system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
 
 	_bam = new BamScene(this);
@@ -361,6 +358,11 @@ void QueenEngine::initialise(void) {
 	
 	_sound = Sound::giveSound(_mixer, this, _resource->compression());
 	_walk = new Walk(this);
+
+	registerDefaultSettings();
+	readOptionSettings();
+
+	return 0;
 }
 
 } // End of namespace Queen
diff --git a/queen/queen.h b/queen/queen.h
index 3ca77b9eaa..ceb895d2ce 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -123,9 +123,8 @@ protected:
 
 	void errorString(const char *buf_input, char *buf_output);
 
-	void go();
-
-	void initialise();
+	int go();
+	int init();
 
 
 	int _talkSpeed;