From a244948f218e05d57b0bff72f5ec0c26cfe67f46 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Wed, 1 Nov 2017 16:52:12 +0000 Subject: [PATCH] fix action_call index numbers for the args, add missing breaks after LUA_TUSERDATA code in infolib (I am dumb dumb dumb dumb dumb dumb) --- src/dehacked.c | 6 +++--- src/lua_infolib.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 7f6d34db4..ec63f619a 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7904,9 +7904,9 @@ static int action_call(lua_State *L) { //actionf_t *action = lua_touserdata(L,lua_upvalueindex(1)); actionf_t *action = *((actionf_t **)luaL_checkudata(L, 1, META_ACTION)); - mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ)); - var1 = (INT32)luaL_optinteger(L,2,0); - var2 = (INT32)luaL_optinteger(L,3,0); + mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ)); + var1 = (INT32)luaL_optinteger(L, 3, 0); + var2 = (INT32)luaL_optinteger(L, 4, 0); if (!actor) return LUA_ErrInvalid(L, "mobj_t"); action->acp1(actor); diff --git a/src/lua_infolib.c b/src/lua_infolib.c index 0a25965d8..be146a04c 100644 --- a/src/lua_infolib.c +++ b/src/lua_infolib.c @@ -326,6 +326,7 @@ static int lib_setState(lua_State *L) state->action = *action; state->action.acv = action->acv; state->action.acp1 = action->acp1; + break; } case LUA_TFUNCTION: // It's a function (a Lua function or a C function? either way!) lua_getfield(L, LUA_REGISTRYINDEX, LREG_STATEACTION); @@ -531,6 +532,7 @@ static int state_set(lua_State *L) st->action = *action; st->action.acv = action->acv; st->action.acp1 = action->acp1; + break; } case LUA_TFUNCTION: // It's a function (a Lua function or a C function? either way!) lua_getfield(L, LUA_REGISTRYINDEX, LREG_STATEACTION);