[Scummvm-cvs-logs] CVS: residual engine.h,1.11,1.12 engine.cpp,1.41,1.42 lua.cpp,1.74,1.75

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Thu Nov 4 00:47:35 CET 2004


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

Modified Files:
	engine.h engine.cpp lua.cpp 
Log Message:
Fixed compilation. (Well, it compiles for me now, at least. For all I know
I may have broken it for someone else.)


Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- engine.h	1 Nov 2004 16:36:41 -0000	1.11
+++ engine.h	4 Nov 2004 08:41:01 -0000	1.12
@@ -145,7 +145,7 @@
 	void savegameRestore();
 	static void savegameGzread(void *data, int32 size);
 	static void savegameGzwrite(void *data, int32 size);
-	void savegameCallback(void *func);
+	void savegameCallback(void (*func)(void *, int32));
 
 	bool _savegameLoadRequest;
 	bool _savegameSaveRequest;

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- engine.cpp	1 Nov 2004 19:33:43 -0000	1.41
+++ engine.cpp	4 Nov 2004 08:41:01 -0000	1.42
@@ -262,7 +262,7 @@
 	lua_dofile("patch05.bin");
 }
 
-void Engine::savegameCallback(void *func) {
+void Engine::savegameCallback(void (*func)(void *, int32)) {
 	lua_Object funcParam1;
 	lua_Object funcParam2;
 	bool unk1 = false;

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- lua.cpp	1 Nov 2004 22:18:05 -0000	1.74
+++ lua.cpp	4 Nov 2004 08:41:01 -0000	1.75
@@ -1303,7 +1303,7 @@
 			Localizer::instance()->localize(str).c_str(), x, y);
 }
 
-#define STUB_FUNC(name) static void name() { stubWarning(__FUNCTION__); }
+#define STUB_FUNC(name) static void name() { stubWarning(#name); }
 STUB_FUNC(RestoreIMuse)
 STUB_FUNC(SaveIMuse)
 STUB_FUNC(SetActorInvClipNode)





More information about the Scummvm-git-logs mailing list