[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.122,1.123 sword2.h,1.68,1.69

[Max Horn]

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

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

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- sword2.cpp	20 Nov 2004 23:49:11 -0000	1.122
+++ sword2.cpp	23 Nov 2004 00:03:25 -0000	1.123
@@ -223,7 +223,7 @@
 	_resman->openResource(CUR_PLAYER_ID);
 }
     
-void Sword2Engine::mainInit() {
+int Sword2Engine::init() {
 	// Get some falling RAM and put it in your pocket, never let it slip
 	// away
 
@@ -288,7 +288,7 @@
 		// will either have killed the music, or done a crossfade.
 
 		if (_quit)
-			return;
+			return 0;
 
 		if (result)
 			startGame();
@@ -296,9 +296,11 @@
 		startGame();
 
 	_graphics->initialiseRenderCycle();
+	
+	return 0;
 }
 
-void Sword2Engine::mainRun() {
+int Sword2Engine::go() {
 	while (1) {
 		if (_debugger->isAttached())
 			_debugger->onFrame();
@@ -370,11 +372,8 @@
 		buildDisplay();
 #endif
 	}
-}
-
-void Sword2Engine::go() {
-	mainInit();
-	mainRun();
+	
+	return 0;
 }
 
 void Sword2Engine::closeGame() {

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sword2.h	16 Nov 2004 09:15:25 -0000	1.68
+++ sword2.h	23 Nov 2004 00:03:25 -0000	1.69
@@ -170,9 +170,8 @@
 public:
 	Sword2Engine(GameDetector *detector, OSystem *syst);
 	~Sword2Engine();
-	void go();
-	void mainInit();
-	void mainRun();
+	int go();
+	int init();
 
 	void setupPersistentResources();