[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.95,1.96 queen.h,1.33,1.34

Max Horn fingolfin at users.sourceforge.net
Mon Nov 22 16:05:05 CET 2004


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

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

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- queen.cpp	20 Nov 2004 23:49:10 -0000	1.95
+++ queen.cpp	23 Nov 2004 00:03:20 -0000	1.96
@@ -288,12 +288,7 @@
 	strcpy(buf2, buf1);
 }
 
-void QueenEngine::go() {
-	initialise();
-
-	registerDefaultSettings();
-	readOptionSettings();
-
+int QueenEngine::go() {
 	_logic->oldRoom(0);
 	_logic->newRoom(_logic->currentRoom());
 
@@ -319,9 +314,11 @@
 			}
 		}
 	}
+	
+	return 0;
 }
 
-void QueenEngine::initialise(void) {
+int QueenEngine::init() {
 	_system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
 
 	_bam = new BamScene(this);
@@ -361,6 +358,11 @@
 	
 	_sound = Sound::giveSound(_mixer, this, _resource->compression());
 	_walk = new Walk(this);
+
+	registerDefaultSettings();
+	readOptionSettings();
+
+	return 0;
 }
 
 } // End of namespace Queen

Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- queen.h	10 Nov 2004 17:49:25 -0000	1.33
+++ queen.h	23 Nov 2004 00:03:20 -0000	1.34
@@ -123,9 +123,8 @@
 
 	void errorString(const char *buf_input, char *buf_output);
 
-	void go();
-
-	void initialise();
+	int go();
+	int init();
 
 
 	int _talkSpeed;





More information about the Scummvm-git-logs mailing list