incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move cv_showgremlins code to P_SweepTestLines so it can still fire

Browse source
This commit is contained in:
JugadorXEI 2025-09-21 18:35:50 +02:00 committed by NepDisk
parent 01b2f9d5b0
commit eb4d4717e5
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/p_map.c
View file

@ -3496,25 +3496,12 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
slidemo = mo;
bestslideline = result->line;
if (bestslideline == NULL && cv_showgremlins.value)
/*if (mo->health <= 0)
{
// debug
mobj_t*x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK);
x->frame = FF_FULLBRIGHT | FF_ADD;
x->renderflags = RF_ALWAYSONTOP;
x->color = SKINCOLOR_RED;
CONS_Printf(
"GREMLIN: leveltime=%u x=%f y=%f z=%f angle=%f\n",
leveltime,
FixedToFloat(mo->x),
FixedToFloat(mo->y),
FixedToFloat(mo->z),
AngleToFloat(R_PointToAngle2(0, 0, oldmomx, oldmomy))
);
tmxmove = mo->momx;
tmymove = mo->momy;
}
if (mo->eflags & MFE_JUSTBOUNCEDWALL) // Stronger push-out
else */if (mo->eflags & MFE_JUSTBOUNCEDWALL) // Stronger push-out
{
tmxmove = mmomx;
tmymove = mmomy;

28
src/p_test.cpp
View file

@ -34,6 +34,8 @@ void P_TestLine(line_t* ld)
line_t* P_SweepTestLines(fixed_t ax, fixed_t ay, fixed_t bx, fixed_t by, fixed_t r, vector2_t* return_normal)
{
extern consvar_t cv_showgremlins;
using namespace srb2::math;
using namespace srb2::sweep;
@ -90,6 +92,32 @@ line_t* P_SweepTestLines(fixed_t ax, fixed_t ay, fixed_t bx, fixed_t by, fixed_t
return_normal->x = FINECOSINE((lineangle >> ANGLETOFINESHIFT) & FINEMASK);
return_normal->y = FINESINE((lineangle >> ANGLETOFINESHIFT) & FINEMASK);
// Moving the gremlin debug here so that it
// still fires even when the workaround is used.
if (cv_showgremlins.value)
{
mobj_t *mo = g_tm.thing;
if (mo)
{
mobj_t *x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK);
x->frame = FF_FULLBRIGHT | FF_ADD;
x->renderflags = RF_ALWAYSONTOP;
x->color = SKINCOLOR_RED;
CONS_Printf(
"GREMLIN: leveltime=%u x=%f y=%f z=%f momx=%f momy=%f momz=%f\n",
leveltime,
FixedToFloat(mo->x),
FixedToFloat(mo->y),
FixedToFloat(mo->z),
FixedToFloat(mo->momx),
FixedToFloat(mo->momy),
FixedToFloat(mo->momz)
);
}
}
}
g_lines.clear();