stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-27 14:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Expose P_LineIsBlocking

Browse source
This commit is contained in:
SMS Alfredo 2023-09-17 18:45:57 -05:00
parent f02fd19c5a
commit a977fd6075
3 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/lua_baselib.c
View file

@ -1840,6 +1840,45 @@ static int lib_pMoveOrigin(lua_State *L)
return 2; return 2;
} }
static int lib_pLineIsBlocking(lua_State *L)
{
mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
line_t *line = *((line_t **)luaL_checkudata(L, 2, META_LINE));
NOHUD
INLEVEL
if (!mo)
return LUA_ErrInvalid(L, "mobj_t");
if (!line)
return LUA_ErrInvalid(L, "line_t");
// P_LineOpening in P_LineIsBlocking sets these variables.
// We want to keep their old values after so that whatever
// map collision code uses them doesn't get messed up.
fixed_t oldopentop = opentop;
fixed_t oldopenbottom = openbottom;
fixed_t oldopenrange = openrange;
fixed_t oldlowfloor = lowfloor;
fixed_t oldhighceiling = highceiling;
pslope_t *oldopentopslope = opentopslope;
pslope_t *oldopenbottomslope = openbottomslope;
ffloor_t *oldopenfloorrover = openfloorrover;
ffloor_t *oldopenceilingrover = openceilingrover;
lua_pushboolean(L, P_LineIsBlocking(mo, line));
opentop = oldopentop;
openbottom = oldopenbottom;
openrange = oldopenrange;
lowfloor = oldlowfloor;
highceiling = oldhighceiling;
opentopslope = oldopentopslope;
openbottomslope = oldopenbottomslope;
openfloorrover = oldopenfloorrover;
openceilingrover = oldopenceilingrover;
return 1;
}
static int lib_pSlideMove(lua_State *L) static int lib_pSlideMove(lua_State *L)
{ {
mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@ -4147,6 +4186,7 @@ static luaL_Reg lib[] = {
{"P_TeleportMove",lib_pTeleportMove}, {"P_TeleportMove",lib_pTeleportMove},
{"P_SetOrigin",lib_pSetOrigin}, {"P_SetOrigin",lib_pSetOrigin},
{"P_MoveOrigin",lib_pMoveOrigin}, {"P_MoveOrigin",lib_pMoveOrigin},
{"P_LineIsBlocking",lib_pLineIsBlocking},
{"P_SlideMove",lib_pSlideMove}, {"P_SlideMove",lib_pSlideMove},
{"P_BounceMove",lib_pBounceMove}, {"P_BounceMove",lib_pBounceMove},
{"P_CheckSight", lib_pCheckSight}, {"P_CheckSight", lib_pCheckSight},

1
src/p_local.h
View file

@ -418,6 +418,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff);
boolean P_Move(mobj_t *actor, fixed_t speed); boolean P_Move(mobj_t *actor, fixed_t speed);
boolean P_SetOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z); boolean P_SetOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z);
boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z); boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z);
boolean P_LineIsBlocking(mobj_t *mo, line_t *li);
void P_SlideMove(mobj_t *mo); void P_SlideMove(mobj_t *mo);
void P_BounceMove(mobj_t *mo); void P_BounceMove(mobj_t *mo);
boolean P_CheckSight(mobj_t *t1, mobj_t *t2); boolean P_CheckSight(mobj_t *t1, mobj_t *t2);

29
src/p_map.c
View file

@ -3400,36 +3400,41 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle)
return false; return false;
} }
static boolean PTR_LineIsBlocking(line_t *li) //
// P_LineIsBlocking
//
// Determines if line would block mo's movement
//
boolean P_LineIsBlocking(mobj_t *mo, line_t *li)
{ {
// one-sided linedefs are always solid to sliding movement. // one-sided linedefs are always solid to sliding movement.
if (!li->backsector) if (!li->backsector)
return !P_PointOnLineSide(slidemo->x, slidemo->y, li); return !P_PointOnLineSide(mo->x, mo->y, li);
if (!(slidemo->flags & MF_MISSILE)) if (!(mo->flags & MF_MISSILE))
{ {
if (li->flags & ML_IMPASSIBLE) if (li->flags & ML_IMPASSIBLE)
return true; return true;
if ((slidemo->flags & (MF_ENEMY|MF_BOSS)) && li->flags & ML_BLOCKMONSTERS) if ((mo->flags & (MF_ENEMY|MF_BOSS)) && li->flags & ML_BLOCKMONSTERS)
return true; return true;
} }
// set openrange, opentop, openbottom // set openrange, opentop, openbottom
P_LineOpening(li, slidemo); P_LineOpening(li, mo);
if (openrange < slidemo->height) if (openrange < mo->height)
return true; // doesn't fit return true; // doesn't fit
if (opentop - slidemo->z < slidemo->height) if (opentop - mo->z < mo->height)
return true; // mobj is too high return true; // mobj is too high
if (openbottom - slidemo->z > FixedMul(MAXSTEPMOVE, slidemo->scale)) if (openbottom - mo->z > FixedMul(MAXSTEPMOVE, mo->scale))
return true; // too big a step up return true; // too big a step up
if (slidemo->player if (mo->player
&& openrange < P_GetPlayerHeight(slidemo->player) && openrange < P_GetPlayerHeight(mo->player)
&& !P_PlayerCanEnterSpinGaps(slidemo->player)) && !P_PlayerCanEnterSpinGaps(mo->player))
return true; // nonspin character should not take this path return true; // nonspin character should not take this path
return false; return false;
@ -3533,7 +3538,7 @@ static boolean PTR_SlideTraverse(intercept_t *in)
li = in->d.line; li = in->d.line;
if (!PTR_LineIsBlocking(li)) if (!P_LineIsBlocking(slidemo, li))
return true; return true;
// the line blocks movement, // the line blocks movement,