[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.63,1.64 sword1.h,1.18,1.19

[Max Horn]

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

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

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- sword1.cpp	20 Nov 2004 23:49:11 -0000	1.63
+++ sword1.cpp	23 Nov 2004 00:03:24 -0000	1.64
@@ -123,7 +123,7 @@
 	delete _resMan;
 }
 
-void SwordEngine::initialize(void) {
+int SwordEngine::init() {
 
 	// Add default file directories
 	File::addDefaultDirectory(_gameDataPath + "CLUSTERS/");
@@ -198,6 +198,8 @@
 	_objectMan->initialize();
 	_mouse->initialize();
 	_control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music, getSavePath());
+	
+	return 0;
 }
 
 void SwordEngine::reinitialize(void) {
@@ -1129,9 +1131,8 @@
 	}
 }
 
-void SwordEngine::go(void) {
+int SwordEngine::go() {
 	
-	initialize();
 	checkCdFiles();
 
 	uint8 startPos = ConfMan.getInt("boot_param");
@@ -1163,6 +1164,8 @@
 			_systemVars.controlPanelMode = CP_NORMAL;
 		}
 	}
+	
+	return 0;
 }
 
 void SwordEngine::checkCd(void) {

Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sword1.h	19 Nov 2004 07:55:33 -0000	1.18
+++ sword1.h	23 Nov 2004 00:03:24 -0000	1.19
@@ -75,10 +75,10 @@
 
 	uint32 _features;
 protected:
-	void go();
+	int go();
+	int init();
 private:
 	void delay(uint amount);
-	void initialize(void);
 
 	void checkCdFiles(void);
 	void checkCd(void);