From e4aab9128e68e0001be85abdd2c7adcfef4fe4c1 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 6 May 2025 19:40:22 +0200 Subject: [PATCH] dont have acp1 anymore --- src/p_polyobj.c | 16 ++++------------ src/p_spec.c | 20 +++++--------------- src/p_user.c | 4 +--- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/p_polyobj.c b/src/p_polyobj.c index 76bf96c48..7842cfad3 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1916,9 +1916,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th) // Find next waypoint for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next) { - if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker - continue; - if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker continue; mo2 = (mobj_t *)wp; @@ -1957,9 +1955,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th) for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next) { - if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker - continue; - if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker continue; mo2 = (mobj_t *)wp; @@ -1996,9 +1992,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th) for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next) { - if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker - continue; - if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker continue; mo2 = (mobj_t *)wp; @@ -2518,9 +2512,7 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata) // Find the first waypoint we need to use for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next) { - if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker - continue; - if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker continue; mo2 = (mobj_t *)wp; diff --git a/src/p_spec.c b/src/p_spec.c index a151264af..e9d65b5c1 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -3762,9 +3762,7 @@ DoneSection2: // to find the first waypoint for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; @@ -3843,9 +3841,7 @@ DoneSection2: // to find the last waypoint for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; @@ -4062,9 +4058,7 @@ DoneSection2: // to find the first waypoint for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; @@ -4102,9 +4096,7 @@ DoneSection2: // Find waypoint before this one (waypointlow) for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; @@ -4131,9 +4123,7 @@ DoneSection2: // Find waypoint after this one (waypointhigh) for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) continue; mo2 = (mobj_t *)th; diff --git a/src/p_user.c b/src/p_user.c index fe44b05eb..dde2a1ecf 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2579,9 +2579,7 @@ static void P_DoZoomTube(player_t *player) // Find next waypoint for (th = thinkercap.next; th != &thinkercap; th = th->next) { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker - continue; - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + if (th->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker continue; mo2 = (mobj_t *)th;