[Scummvm-git-logs] scummvm master -> 95250cfbb91b2bd9411a6a78c6d2a474c7cc6102

aquadran noreply at scummvm.org
Wed Jan 5 08:08:49 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
95250cfbb9 GRIM: Ignore not function param at startscript for all games


Commit: 95250cfbb91b2bd9411a6a78c6d2a474c7cc6102
    https://github.com/scummvm/scummvm/commit/95250cfbb91b2bd9411a6a78c6d2a474c7cc6102
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-01-05T09:08:44+01:00

Commit Message:
GRIM: Ignore not function param at startscript for all games

Changed paths:
    engines/grim/lua/ltask.cpp


diff --git a/engines/grim/lua/ltask.cpp b/engines/grim/lua/ltask.cpp
index 90c018af461..61d95a5c6a9 100644
--- a/engines/grim/lua/ltask.cpp
+++ b/engines/grim/lua/ltask.cpp
@@ -38,17 +38,7 @@ void start_script() {
 	lua_Type type = paramObj == LUA_NOOBJECT ? LUA_T_NIL : ttype(Address(paramObj));
 
 	if (paramObj == LUA_NOOBJECT || (type != LUA_T_CPROTO && type != LUA_T_PROTO)) {
-		if (g_grim->getGameType() == GType_MONKEY4) {
-			/* In the discussion with meathook (dlg_meathook2.lua),
-			 * start_script is called as start_script(meathook:shake_head(...)).
-			 * But start_script expects start_script(meathook.shake_head, shake_head, ...). */
-			warning("Bad argument to start_script, ignoring");
-			lua_pushnil();
-			return;
-		} else {
-			lua_error("Bad argument to start_script");
-			return;
-		}
+		return;
 	}
 
 	LState *state = luaM_new(LState);




More information about the Scummvm-git-logs mailing list