[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.65,1.66 saga.h,1.44,1.45

[Max Horn]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32311/saga

Modified Files:
	saga.cpp saga.h 
Log Message:
Added Engine::init() method; added return value to Engine::go()

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- saga.cpp	20 Nov 2004 23:49:10 -0000	1.65
+++ saga.cpp	23 Nov 2004 00:03:20 -0000	1.66
@@ -124,9 +124,7 @@
 	strcpy(buf2, buf1);
 }
 
-void SagaEngine::go() {
-	int msec = 0;
-
+int SagaEngine::init() {
 	_soundEnabled = 1;
 	_musicEnabled = 1;
 
@@ -156,7 +154,7 @@
 
 	// Detect game and open resource files
 	if (GAME_Init() != SUCCESS) {
-		return;
+		return -1;
 	}
 
 	// Initialize engine modules
@@ -174,7 +172,8 @@
 
 	if (!_scene->initialized()) {
 		warning("Couldn't initialize scene module");
-		return;
+		// TODO/FIXME: We are leaking here
+		return -1;
 	}
 
 	// System initialization
@@ -214,7 +213,8 @@
 	
 	_render = new Render(this, _system);
 	if (!_render->initialized()) {
-		return;
+		// TODO/FIXME: We are leaking here
+		return -1;
 	}
 
 	// Initialize system specific sound
@@ -232,6 +232,12 @@
 	_render->reg();
 	_anim->reg();
 
+	return 0;
+}
+
+int SagaEngine::go() {
+	int msec = 0;
+
 	_previousTicks = _system->getMillis();
 
 	_sprite->loadList(ITE_MAIN_SPRITES, &_mainSprites);
@@ -265,6 +271,8 @@
 		_render->drawScene();
 		_system->delayMillis(10);
 	}
+	
+	return 0;
 }
 
 void SagaEngine::shutdown() {

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- saga.h	7 Nov 2004 14:15:41 -0000	1.44
+++ saga.h	23 Nov 2004 00:03:20 -0000	1.45
@@ -88,7 +88,8 @@
 	void errorString(const char *buf_input, char *buf_output);
 
 protected:
-	void go();
+	int go();
+	int init();
 
 public:
 	SagaEngine(GameDetector * detector, OSystem * syst);