[Scummvm-cvs-logs] CVS: residual/lua ltask.cpp,1.8,1.9

Erich Edgar Hoover compholio at users.sourceforge.net
Sun Jul 31 20:52:03 CEST 2005


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

Modified Files:
	ltask.cpp 
Log Message:
fixed some actor movement issues - fixed several scene changing issues - fixed memory bugs in LocalizeString and isVoicePlaying - fixed start_script called with LUA_T_NIL

Index: ltask.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/ltask.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ltask.cpp	21 Jul 2005 15:16:35 -0000	1.8
+++ ltask.cpp	1 Aug 2005 03:49:02 -0000	1.9
@@ -32,6 +32,11 @@
 	f = L->stack.stack + L->Cstack.lua2C;
 	if (ttype(f) == LUA_T_CLOSURE)
 		f = &clvalue(f)->consts[0];
+	// Start nothing? start_script gets called in this fashion
+	// by the scene in the scrimshaw parlor, if we just return
+	// immediately the game proceeds ok.
+	if (ttype(f) == LUA_T_NIL)
+		return;
 	if (ttype(f) != LUA_T_PROTO)
 		lua_error("can only start_script with a Lua function");
 





More information about the Scummvm-git-logs mailing list