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

svn-id: r15865

2 files changed, 9 insertions, 2 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index b7519e8ca4..44332bc3ba 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -659,7 +659,9 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 	_vc_10_base_ptr_old = 0;
 	memcpy (_hebrew_char_widths,
 		"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
+}
 
+int SimonEngine::init() {
 	// Setup mixer
 	if (!_mixer->isReady())
 		warning("Sound initialization failed. "
@@ -718,6 +720,8 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
 	g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true);
+	
+	return 0;
 }
 
 SimonEngine::~SimonEngine() {
@@ -4668,7 +4672,7 @@ void SimonEngine::fadeUpPalette() {
  	} while (!done);
 }
 
-void SimonEngine::go() {
+int SimonEngine::go() {
 	if (!_dump_file)
 		_dump_file = stdout;
 
@@ -4728,6 +4732,8 @@ void SimonEngine::go() {
 		handle_verb_clicked(_verb_hitarea);
 		delay(100);
 	}
+	
+	return 0;
 }
 
 void SimonEngine::shutdown() {
diff --git a/simon/simon.h b/simon/simon.h
index f2cc99910a..b0c72491c1 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -740,7 +740,8 @@ protected:
 
 	void resfile_read(void *dst, uint32 offs, uint32 size);
 
-	void go();
+	int init();
+	int go();
 	void openGameFile();
 
 	static int CDECL game_thread_proc(void *param);