stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint

Browse source
This commit is contained in:
MascaraSnake 2020-05-16 09:09:26 +02:00
parent 3680b246c9
commit 06dda9c69d
1 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/p_polyobj.c
View file

@ -2131,8 +2131,6 @@ boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
polyobj_t *po; polyobj_t *po;
polywaypoint_t *th; polywaypoint_t *th;
mobj_t *first = NULL; mobj_t *first = NULL;
mobj_t *last = NULL;
mobj_t *target = NULL;
if (!(po = Polyobj_GetForNum(pwdata->polyObjNum))) if (!(po = Polyobj_GetForNum(pwdata->polyObjNum)))
{ {
@ -2165,7 +2163,6 @@ boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
// Find the first waypoint we need to use // Find the first waypoint we need to use
first = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence); first = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
last = (th->direction == -1) ? P_GetFirstWaypoint(th->sequence) : P_GetLastWaypoint(th->sequence);
if (!first) if (!first)
{ {
@ -2175,35 +2172,8 @@ boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
return false; return false;
} }
// Hotfix to not crash on single-waypoint sequences -Red
if (!last)
last = first;
if (last->x == po->centerPt.x
&& last->y == po->centerPt.y
&& last->z == (po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2))
{
// Already at the destination point...
if (th->returnbehavior != PWR_WRAP)
{
po->thinker = NULL;
P_RemoveThinker(&th->thinker);
}
}
// Find the actual target movement waypoint
target = first;
if (!target)
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: Missing target waypoint!\n");
po->thinker = NULL;
P_RemoveThinker(&th->thinker);
return false;
}
// Set pointnum // Set pointnum
th->pointnum = target->health; th->pointnum = first->health;
// We don't deal with the mirror crap here, we'll // We don't deal with the mirror crap here, we'll
// handle that in the T_Thinker function. // handle that in the T_Thinker function.