[Scummvm-cvs-logs] CVS: residual lua.cpp,1.56,1.57

[James Brown]

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

Modified Files:
	lua.cpp 
Log Message:
Fix entering office


Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- lua.cpp	26 Mar 2004 04:42:27 -0000	1.56
+++ lua.cpp	26 Mar 2004 07:26:39 -0000	1.57
@@ -158,8 +158,12 @@
 	char *filename;
 	int line;
 
-	if (! lua_isfunction(lua_getparam(1)))
-		luaL_argerror(1, "expected function");
+	if (!lua_isfunction(lua_getparam(1))) {
+		sprintf(buf, "function InvalidArgsToFunctionName");
+		lua_pushstring(buf);
+		return;
+	}
+
 	lua_funcinfo(lua_getparam(1), &filename, &line);
 	switch (*lua_getobjname(lua_getparam(1), &name)) {
 	case 'g':
@@ -313,7 +317,8 @@
 static void SetActorTalkChore() {
 	Actor *act = check_actor(1);
 	int index = check_int(2);
-	int chore = check_int(3);
+	int chore = lua_isnil(lua_getparam(3)) ? check_int(3) : -1;
+
 	Costume *costume = get_costume(act, 4, "setActorTalkChore");
 
 	act->setTalkChore(index, chore, costume);