diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c index 46867a559..0b93766b8 100644 --- a/src/lua_blockmaplib.c +++ b/src/lua_blockmaplib.c @@ -53,12 +53,10 @@ static UINT8 lib_searchBlockmap_Objects(lua_State *L, INT32 x, INT32 y, mobj_t * CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); lua_pop(gL, 1); blockfuncerror = true; - P_SetTarget(&bnext, NULL); return 0; // *shrugs* } if (!lua_isnil(gL, -1)) { // if nil, continue - P_SetTarget(&bnext, NULL); if (lua_toboolean(gL, -1)) return 2; // stop whole search else diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index 78f55a2a7..7b1db5327 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -480,8 +480,8 @@ int mobj_hnext_setter(lua_State *L) { mobj_t *mo = GETMO(); - if ((mo->hnext && P_MobjWasRemoved(mo->hnext)) || lua_isnil(L, 2)) - P_SetTarget(&mo->hnext, NULL); + if (lua_isnil(L, 2)) + P_SetTarget(&mo->hnext, NULL); else { mobj_t *hnext = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ)); @@ -495,7 +495,7 @@ int mobj_hprev_setter(lua_State *L) { mobj_t *mo = GETMO(); - if ((mo->hprev && P_MobjWasRemoved(mo->hprev)) || lua_isnil(L, 2)) + if (lua_isnil(L, 2)) P_SetTarget(&mo->hprev, NULL); else { diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 2562a1e67..f30103244 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -311,12 +311,9 @@ int player_axis_setter(lua_State *L) { mobj_t **axis; - UDATALIB_GETFIELD(mobj_t*, axis); + UDATALIB_GETFIELD(mobj_t*, axis); - mobj_t *mo = NULL; - if (!lua_isnil(L, 2)) - mo = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ)); - P_SetTarget(axis, mo); + P_SetTarget(axis, *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ))); return 0; }