From 146cb6b1c343a4e7a231b85528eb7db6e52cd233 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Thu, 20 Jul 2023 00:21:03 +0200 Subject: [PATCH 1/3] remove lua stuff from sprite rotation/scaling shit can desynch people who are on another client, when this client is used to host a server esp airbrakes cause it so ugh --- src/lua_mobjlib.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index d0afa89ff..d3b5745d9 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -36,8 +36,8 @@ int mobj_snext_noset(lua_State *L); int mobj_z_setter(lua_State *L); int mobj_sprev_unimplemented(lua_State *L); int mobj_angle_setter(lua_State *L); -int mobj_sloperoll_noset(lua_State *L); -int mobj_spritescale_setter(lua_State *L); +//int mobj_sloperoll_noset(lua_State *L); +//int mobj_spritescale_setter(lua_State *L); int mobj_touching_sectorlist_unimplemented(lua_State *L); int mobj_radius_setter(lua_State *L); int mobj_height_setter(lua_State *L); @@ -76,15 +76,15 @@ static const udata_field_t mobj_fields[] = { FIELD(mobj_t, snext, udatalib_getter_mobj, mobj_snext_noset), FIELD(mobj_t, sprev, mobj_sprev_unimplemented, mobj_sprev_unimplemented), FIELD(mobj_t, angle, udatalib_getter_angle, mobj_angle_setter), - FIELD(mobj_t, rollangle, udatalib_getter_angle, udatalib_setter_angle), - FIELD(mobj_t, sloperoll, udatalib_getter_angle, mobj_sloperoll_noset), + //FIELD(mobj_t, rollangle, udatalib_getter_angle, udatalib_setter_angle), + //FIELD(mobj_t, sloperoll, udatalib_getter_angle, mobj_sloperoll_noset), FIELD(mobj_t, sprite, udatalib_getter_spritenum, udatalib_setter_spritenum), FIELD(mobj_t, frame, udatalib_getter_uint32, udatalib_setter_uint32), FIELD(mobj_t, anim_duration, udatalib_getter_uint16, udatalib_setter_uint16), - FIELD(mobj_t, spritexscale, udatalib_getter_fixed, mobj_spritescale_setter), - FIELD(mobj_t, spriteyscale, udatalib_getter_fixed, mobj_spritescale_setter), - FIELD(mobj_t, spritexoffset, udatalib_getter_fixed, udatalib_setter_fixed), - FIELD(mobj_t, spriteyoffset, udatalib_getter_fixed, udatalib_setter_fixed), + //FIELD(mobj_t, spritexscale, udatalib_getter_fixed, mobj_spritescale_setter), + //FIELD(mobj_t, spriteyscale, udatalib_getter_fixed, mobj_spritescale_setter), + //FIELD(mobj_t, spritexoffset, udatalib_getter_fixed, udatalib_setter_fixed), + //FIELD(mobj_t, spriteyoffset, udatalib_getter_fixed, udatalib_setter_fixed), FIELD(mobj_t, touching_sectorlist, mobj_touching_sectorlist_unimplemented, mobj_touching_sectorlist_unimplemented), FIELD(mobj_t, subsector, udatalib_getter_subsector, mobj_nosetpos_subsector), FIELD(mobj_t, floorz, udatalib_getter_fixed, mobj_nosetpos_floorz), @@ -133,7 +133,7 @@ static const udata_field_t mobj_fields[] = { FIELD(mobj_t, cvmem, udatalib_getter_int32, udatalib_setter_int32), FIELD(mobj_t, standingslope, udatalib_getter_slope, mobj_standingslope_noset), FIELD(mobj_t, colorized, udatalib_getter_boolean, udatalib_setter_boolean), - FIELD(mobj_t, rollmodel, udatalib_getter_boolean, udatalib_setter_boolean), + //FIELD(mobj_t, rollmodel, udatalib_getter_boolean, udatalib_setter_boolean), { NULL }, }; #undef FIELD @@ -174,7 +174,7 @@ int mobj_ ## field ## _noset(lua_State *L) \ return luaL_error(L, LUA_QL("mobj_t") " field " LUA_QS " should not be set directly.", #field); \ } -NOSET(sloperoll) +//NOSET(sloperoll) NOSET(snext) NOSET(bnext) NOSET(info) @@ -242,14 +242,14 @@ int mobj_spritescale_setter(lua_State *L) if (!mo->player) *spritescale = luaL_checkfixed(L, 2); - else + /*else { // Mmm yea if (spritescale == &mo->spritexscale) mo->realxscale = luaL_checkfixed(L, 2); else mo->realyscale = luaL_checkfixed(L, 2); - } + }*/ return 0; } -- 2.54.0 From 3c648e683981c5fbffce1e111b2c95237c9a59e8 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Thu, 20 Jul 2023 00:26:11 +0200 Subject: [PATCH 2/3] forgor smh --- src/p_enemy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index ef0255f3b..01b1e8f56 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -7444,10 +7444,10 @@ void A_RollAngle(mobj_t *actor) INT32 locvar2 = var2; const angle_t angle = FixedAngle(locvar1*FRACUNIT); -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA if (LUA_CallAction("A_RollAngle", actor)) return; -#endif +#endif*/ // relative (default) if (!locvar2) @@ -7470,10 +7470,10 @@ void A_ChangeRollAngleRelative(mobj_t *actor) INT32 locvar2 = var2; const fixed_t amin = locvar1*FRACUNIT; const fixed_t amax = locvar2*FRACUNIT; -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA if (LUA_CallAction("A_ChangeRollAngleRelative", actor)) return; -#endif +#endif*/ #ifdef PARANOIA if (amin > amax) @@ -7496,10 +7496,10 @@ void A_ChangeRollAngleAbsolute(mobj_t *actor) INT32 locvar2 = var2; const fixed_t amin = locvar1*FRACUNIT; const fixed_t amax = locvar2*FRACUNIT; -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA if (LUA_CallAction("A_ChangeRollAngleAbsolute", actor)) return; -#endif +#endif*/ #ifdef PARANOIA if (amin > amax) -- 2.54.0 From bdeb3c1105dd48ee96f642651ff6e4782a3d4273 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 20 Jul 2023 08:45:35 +0300 Subject: [PATCH 3/3] Comment out function mobj_spritescale_setter completely --- src/lua_mobjlib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index d3b5745d9..9788e9a83 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -233,7 +233,7 @@ int mobj_angle_setter(lua_State *L) return 0; } -int mobj_spritescale_setter(lua_State *L) +/*int mobj_spritescale_setter(lua_State *L) { mobj_t *mo = GETMO(); @@ -242,16 +242,16 @@ int mobj_spritescale_setter(lua_State *L) if (!mo->player) *spritescale = luaL_checkfixed(L, 2); - /*else + else { // Mmm yea if (spritescale == &mo->spritexscale) mo->realxscale = luaL_checkfixed(L, 2); else mo->realyscale = luaL_checkfixed(L, 2); - }*/ + } return 0; -} +}*/ int mobj_radius_setter(lua_State *L) { -- 2.54.0