From b8038130b8fcdf5883da9555a53c451e84c2dcd0 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 27 Aug 2024 05:51:35 +0200 Subject: [PATCH] fix conflict --- src/p_tick.c | 4 ++-- src/p_tick.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_tick.c b/src/p_tick.c index 453818257..7cf876188 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -216,7 +216,7 @@ static thinker_t *currentthinker; // remove it, and set currentthinker to one node preceeding it, so // that the next step in P_RunThinkers() will get its successor. // -void P_RemoveThinkerDelayed(void *pthinker) +void P_RemoveThinkerDelayed(thinker_t *thinker) { #ifdef PARANOIA if (thinker->next) @@ -268,7 +268,7 @@ void P_UnlinkThinker(thinker_t *thinker) void P_RemoveThinker(thinker_t *thinker) { LUA_InvalidateUserdata(thinker); - thinker->function.acp1 = P_RemoveThinkerDelayed; + thinker->function.acp1 = (actionf_p1)P_RemoveThinkerDelayed; } /* diff --git a/src/p_tick.h b/src/p_tick.h index d22995a11..11b5889ed 100644 --- a/src/p_tick.h +++ b/src/p_tick.h @@ -28,7 +28,7 @@ void P_RunChaseCameras(void); void P_Ticker(boolean run); void P_PreTicker(INT32 frames); void P_DoTeamscrambling(void); -void P_RemoveThinkerDelayed(void *pthinker); //killed +void P_RemoveThinkerDelayed(thinker_t *thinker); mobj_t *P_SetTarget(mobj_t **mo, mobj_t *target); // killough 11/98 #endif