saturn/SRB2Kart-Saturn
2
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 23 Wiki Activity

Rolluaremoval #3

Merged
Indev450 merged 3 commits from rolluaremoval into Saturn 2023-07-20 07:52:10 +02:00
Conversation 0 Commits 3 Files Changed 2
+18 -18
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/lua_mobjlib.c
+12 -12
View File
@@ -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)
@@ -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();
@@ -251,7 +251,7 @@ int mobj_spritescale_setter(lua_State *L)
mo->realyscale = luaL_checkfixed(L, 2);
}
return 0;
}
}*/
int mobj_radius_setter(lua_State *L)
{
src/p_enemy.c
+6 -6
View File
@@ -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)