[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.508,1.509 simon.h,1.139,1.140

Gregory Montoir cyx at users.sourceforge.net
Thu Aug 11 11:11:38 CEST 2005


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

Modified Files:
	simon.cpp simon.h 
Log Message:
get rid of game_thread_proc

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -d -r1.508 -r1.509
--- simon.cpp	30 Jul 2005 21:11:35 -0000	1.508
+++ simon.cpp	11 Aug 2005 18:08:55 -0000	1.509
@@ -776,7 +776,7 @@
 	}
 }
 
-void palette_fadeout(uint32 *pal_values, uint num) {
+void SimonEngine::palette_fadeout(uint32 *pal_values, uint num) {
 	byte *p = (byte *)pal_values;
 
 	do {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- simon.h	30 Jul 2005 21:11:35 -0000	1.139
+++ simon.h	11 Aug 2005 18:08:55 -0000	1.140
@@ -387,6 +387,8 @@
 	void readItemFromGamePc(Common::File *in, Item *item);
 	void loadGamePcFile(const char *filename);
 
+	void palette_fadeout(uint32 *pal_values, uint num);
+	
 	byte *allocateItem(uint size);
 	byte *allocateTable(uint size);
 	void alignTableMem();
@@ -739,8 +741,6 @@
 	int go();
 	void openGameFile();
 
-	static int CDECL game_thread_proc(void *param);
-
 	void timer_callback();
 	void timer_proc1();
 
@@ -818,8 +818,6 @@
 	char *gen_savename(int slot);
 };
 
-void palette_fadeout(uint32 *pal_values, uint num);
-
 } // End of namespace Simon
 
 #endif





More information about the Scummvm-git-logs mailing list