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

Fix waypoint maps crashing if there is no finish line

Browse source
This commit is contained in:
GenericHeroGuy 2025-12-03 17:18:02 +01:00
parent e5434e3f14
commit 2c90f46136
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_waypoint.cpp
View file

@ -372,16 +372,19 @@ waypoint_t *K_GetSpawnWaypointForMobj(const mobj_t *mobj)
waypoint_t *closestwaypoint = NULL;
fixed_t closestdist = INT32_MAX;
line_t *finish = P_FindNearestLine(finishline->mobj->x, finishline->mobj->y, nullptr, 2001); // erm... NULL? thanks hanagumi hall
INT32 myside = P_PointOnLineSide(mobj->x, mobj->y, finish);
INT32 myside = finish != NULL ? P_PointOnLineSide(mobj->x, mobj->y, finish) : 0;
I_Assert(mobj != NULL);
if (finish == NULL)
CONS_Alert(CONS_WARNING, "No finish line linedef found!\n");
for (size_t i = 0; i < numwaypoints; i++)
{
waypoint_t *checkwaypoint = &waypointheap[i];
if (!K_GetWaypointIsEnabled(checkwaypoint)
|| checkwaypoint == finishline
|| myside != P_PointOnLineSide(checkwaypoint->mobj->x, checkwaypoint->mobj->y, finish))
|| (finish != NULL && myside != P_PointOnLineSide(checkwaypoint->mobj->x, checkwaypoint->mobj->y, finish)))
continue;
fixed_t checkdist = P_AproxDistance(