From 41244ae52274faaddbed76989b497d65baa7f754 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 7 Oct 2024 23:01:17 +0200 Subject: [PATCH] proper inline P_MobjWasRemoved --- src/p_local.h | 8 +++++++- src/p_mobj.c | 7 ------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index cdbe24f61..00ba80afb 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -246,7 +246,7 @@ void P_RecalcPrecipInSector(sector_t *sector); void P_PrecipitationEffects(void); void P_RemoveMobj(mobj_t *th); -boolean P_MobjWasRemoved(const mobj_t *th); + void P_RemoveSavegameMobj(mobj_t *th); boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state); boolean P_SetMobjState(mobj_t *mobj, statenum_t state); @@ -258,6 +258,12 @@ boolean P_RailThinker(mobj_t *mobj); void P_PushableThinker(mobj_t *mobj); void P_SceneryThinker(mobj_t *mobj); +// This does not need to be added to Lua. +// To test it in Lua, check mobj.valid +FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj) +{ + return !(mobj && mobj->thinker.function.acp1 == (actionf_p1)P_MobjThinker); +} fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); diff --git a/src/p_mobj.c b/src/p_mobj.c index 91100ccec..ce708c420 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10113,13 +10113,6 @@ void P_RemoveMobj(mobj_t *mobj) } } -// This does not need to be added to Lua. -// To test it in Lua, check mobj.valid -FUNCINLINE ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj) -{ - return !(mobj && mobj->thinker.function.acp1 == (actionf_p1)P_MobjThinker); -} - void P_FreePrecipMobj(precipmobj_t *mobj) { // unlink from sector and block lists