[Scummvm-cvs-logs] CVS: residual lab.cpp,1.7,1.8 lua.cpp,1.69,1.70

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Oct 31 07:35:12 CET 2004


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

Modified Files:
	lab.cpp lua.cpp 
Log Message:
- moved GetCurrentScript call from lua into engine lua code
- moved print_stack from dummy func list
- cleanup braces

Index: lab.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lab.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lab.cpp	24 Feb 2004 21:09:53 -0000	1.7
+++ lab.cpp	31 Oct 2004 15:34:13 -0000	1.8
@@ -83,7 +83,7 @@
 	data[i->second.len] = '\0';	// For valgrind cleanness
 	data[i->second.len + 1] = '\0';
 	return new Block(data, i->second.len);
-	}
+}
 
 std::FILE *Lab::openNewStream(const char *filename) const {
 	file_map_type::const_iterator i = find_filename(filename);

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- lua.cpp	31 Oct 2004 10:19:28 -0000	1.69
+++ lua.cpp	31 Oct 2004 15:34:13 -0000	1.70
@@ -1188,6 +1188,10 @@
 	//scene.deleteObjectState(object);
 }
 
+static void GetCurrentScript() {
+	current_script();
+}
+
 // Stub function for builtin functions not yet implemented
 
 static void stubWarning() {
@@ -1410,7 +1414,6 @@
 	"DrawLine",
 	"pause_scripts",
 	"unpause_scripts",
-	"print_stack"
 };
 
 // Entries in the system table
@@ -1676,7 +1679,8 @@
 	{ "SetSpeechMode", SetSpeechMode },
 	{ "GetTextCharPosition", GetTextCharPosition },
 	{ "GetDiskFreeSpace", GetDiskFreeSpace },
-	{ "Is3DHardwareEnabled", Is3DHardwareEnabled }
+	{ "Is3DHardwareEnabled", Is3DHardwareEnabled },
+	{ "GetCurrentScript", GetCurrentScript }
 };
 
 void register_lua() {
@@ -1755,10 +1759,10 @@
 		// d:\grimFandango\Scripts\foo.lua
 		if (std::strstr(filename, "Scripts\\") == NULL)
 			warning("Cannot find script %s\n", filename);
-	return 2;
-}
+		return 2;
+	}
 
-int result = lua_dobuffer(const_cast<char *>(b->data()), b->len(),
+	int result = lua_dobuffer(const_cast<char *>(b->data()), b->len(),
 							const_cast<char *>(filename));
 	delete b;
 	return result;





More information about the Scummvm-git-logs mailing list