[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.463,1.464 simon.h,1.127,1.128

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


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

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

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -d -r1.463 -r1.464
--- simon.cpp	20 Nov 2004 23:49:10 -0000	1.463
+++ simon.cpp	23 Nov 2004 00:03:22 -0000	1.464
@@ -659,7 +659,9 @@
 	_vc_10_base_ptr_old = 0;
 	memcpy (_hebrew_char_widths,
 		"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
+}
 
+int SimonEngine::init() {
 	// Setup mixer
 	if (!_mixer->isReady())
 		warning("Sound initialization failed. "
@@ -718,6 +720,8 @@
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
 	g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true);
+	
+	return 0;
 }
 
 SimonEngine::~SimonEngine() {
@@ -4668,7 +4672,7 @@
  	} while (!done);
 }
 
-void SimonEngine::go() {
+int SimonEngine::go() {
 	if (!_dump_file)
 		_dump_file = stdout;
 
@@ -4728,6 +4732,8 @@
 		handle_verb_clicked(_verb_hitarea);
 		delay(100);
 	}
+	
+	return 0;
 }
 
 void SimonEngine::shutdown() {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- simon.h	23 Oct 2004 00:02:38 -0000	1.127
+++ simon.h	23 Nov 2004 00:03:23 -0000	1.128
@@ -740,7 +740,8 @@
 
 	void resfile_read(void *dst, uint32 offs, uint32 size);
 
-	void go();
+	int init();
+	int go();
 	void openGameFile();
 
 	static int CDECL game_thread_proc(void *param);





More information about the Scummvm-git-logs mailing list