[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.274,1.275 scumm.h,1.516,1.517

[Max Horn]

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

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

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- scumm.cpp	20 Nov 2004 23:49:10 -0000	1.274
+++ scumm.cpp	23 Nov 2004 00:03:20 -0000	1.275
@@ -972,16 +972,11 @@
 	_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 @@
 	} else {
 		_saveLoadFlag = 0;
 	}
+
+	return 0;
 }
 
 void ScummEngine::scummInit() {
@@ -1397,7 +1394,7 @@
 #pragma mark --- Main loop ---
 #pragma mark -
 
-void ScummEngine::mainRun() {
+int ScummEngine::go() {
 	int delta = 0;
 	int diff = _system->getMillis();
 
@@ -1418,6 +1415,8 @@
 			// TODO: Maybe perform an autosave on exit?
 		}
 	}
+	
+	return 0;
 }
 
 void ScummEngine::waitForTimer(int msec_delay) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -d -r1.516 -r1.517
--- scumm.h	22 Nov 2004 22:32:46 -0000	1.516
+++ scumm.h	23 Nov 2004 00:03:21 -0000	1.517
@@ -385,10 +385,10 @@
 	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 @@
 	void setupMusic(int midi);
 
 	// Scumm main loop
-	void mainRun();
 	int scummLoop(int delta);
 
 	// Event handling