From 4e78617c29cad1b5fa7a26ebcc0b1f03a43e4c14 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 7 Aug 2019 12:39:04 -0400
Subject: [PATCH] fix PARANOIA builds
---
src/p_saveg.c | 2 +-
src/p_tick.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 0bfb81f4e0..ea998b445e 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2404,7 +2404,7 @@ static void P_NetArchiveThinkers(void)
}
#endif // ESLOPE
#ifdef PARANOIA
- else if (th->function.acp1 != P_RemoveThinkerDelayed) // wait garbage collection
+ else if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
I_Error("unknown thinker type %p", th->function.acp1);
#endif
}
diff --git a/src/p_tick.c b/src/p_tick.c
index 5ec0fb0481..7606510fef 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -197,7 +197,7 @@ void P_InitThinkers(void)
void P_AddThinker(const thinklistnum_t n, thinker_t *thinker)
{
#ifdef PARANOIA
- I_Assert(n >= 0 && n < NUM_THINKERLISTS);
+ I_Assert(n < NUM_THINKERLISTS);
#endif
thlist[n].prev->next = thinker;
@@ -326,7 +326,7 @@ static inline void P_RunThinkers(void)
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
{
#ifdef PARANOIA
- I_Assert(currentthinker->function.acp1 != NULL)
+ I_Assert(currentthinker->function.acp1 != NULL);
#endif
currentthinker->function.acp1(currentthinker);
}
--
GitLab