[Scummvm-cvs-logs] CVS: residual/lua liolib.cpp,1.3,1.4 lua.h,1.6,1.7

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Aug 20 15:07:02 CEST 2005


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

Modified Files:
	liolib.cpp lua.h 
Log Message:
make credits to work

Index: liolib.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/liolib.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- liolib.cpp	12 Jan 2005 22:10:12 -0000	1.3
+++ liolib.cpp	20 Aug 2005 22:05:55 -0000	1.4
@@ -16,6 +16,9 @@
 #include "luadebug.h"
 #include "lualib.h"
 
+#ifdef ADD_CUSTOM_FOPEN
+#include "../resource.h"
+#endif
 
 #ifndef OLD_ANSI
 #include <locale.h>
@@ -48,7 +51,6 @@
 #define pclose(x)  (-1)
 #endif
 
-
 static int gettag (int i)
 {
   return (int)lua_getnumber(lua_getparam(i));
@@ -135,7 +137,15 @@
     current = (FILE *)lua_getuserdata(f);
   else {
     char *s = luaL_check_string(FIRSTARG);
-    current = (*s == '|') ? popen(s+1, "r") : fopen(s, "r");
+	if (*s == '|') 
+      current = popen(s+1, "r");
+	else {
+      current = fopen(s, "r");
+#ifdef ADD_CUSTOM_FOPEN
+      if (current == NULL)
+	    current = g_resourceloader->openNewStream(s);
+#endif
+	}
     if (current == NULL) {
       pushresult(0);
       return;

Index: lua.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lua.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lua.h	4 Jan 2005 22:42:47 -0000	1.6
+++ lua.h	20 Aug 2005 22:05:55 -0000	1.7
@@ -15,11 +15,13 @@
 #define LUA_COPYRIGHT	"Copyright (C) 1994-1998 TeCGraf, PUC-Rio"
 #define LUA_AUTHORS 	"W. Celes, R. Ierusalimschy & L. H. de Figueiredo"
 
-
 #define LUA_NOOBJECT  0
 
 #define LUA_ANYTAG    (-1)
 
+#define ADD_CUSTOM_FOPEN
+// this allow enable additionaly code in io_readfrom func
+
 typedef void (*lua_CFunction) (void);
 typedef unsigned int lua_Object;
 





More information about the Scummvm-git-logs mailing list