[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.13,1.14 kyra.h,1.5,1.6

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


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

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

Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kyra.cpp	20 Nov 2004 23:49:10 -0000	1.13
+++ kyra.cpp	23 Nov 2004 00:03:20 -0000	1.14
@@ -121,6 +121,9 @@
 	} else {
 		error("unknown game");
 	}
+}
+
+int KyraEngine::init() {
 
 	// Initialize backen
 	syst->initSize(320, 200);
@@ -169,6 +172,8 @@
 	
 	assert(_npcScript);
 	assert(_currentScript);
+	
+	return 0;
 }
 
 KyraEngine::~KyraEngine() {
@@ -185,7 +190,7 @@
 	strcpy(buf2, buf1);
 }
 
-void KyraEngine::go() {
+int KyraEngine::go() {
 	warning("Kyrandia Engine ::go()");
 	// starts the init script
 /*	if (!_currentScript->startScript(kSetupScene)) {
@@ -259,6 +264,8 @@
 	delete movie;
 	delete image;
 	delete [] _buffer;
+	
+	return 0;
 }
 
 void KyraEngine::shutdown() {

Index: kyra.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kyra.h	14 Nov 2004 20:11:22 -0000	1.5
+++ kyra.h	23 Nov 2004 00:03:20 -0000	1.6
@@ -67,7 +67,8 @@
 	uint8 game(void) { return _game; }
 
 protected:
-	void go();
+	int go();
+	int init();
 	void shutdown();
 	Resourcemanager* _resMgr;
 	MusicPlayer* _midiDriver;





More information about the Scummvm-git-logs mailing list