diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 73e5f1e72..e5c946c6e 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -884,7 +884,8 @@ ACTOR_STATIC void G_MoveZombieActors(void) } } -static inline int32_t ifhitsectors(int32_t sectnum) +// stupid name, but it's what the function does. +static inline int32_t G_FindExplosionInSector(int32_t sectnum) { int32_t i = headspritestat[STAT_MISC]; while (i >= 0) @@ -896,9 +897,7 @@ static inline int32_t ifhitsectors(int32_t sectnum) return -1; } -#define IFHITSECT(Sectnum) if (ifhitsectors(Sectnum) >= 0) - -static void nudge_player(int32_t p, int32_t sn, int32_t shl) +static void P_Nudge(int32_t p, int32_t sn, int32_t shl) { g_player[p].ps->vel.x += actor[sn].extra*(sintable[(actor[sn].ang+512)&2047])<vel.y += actor[sn].extra*(sintable[actor[sn].ang&2047])<sectnum) + if (G_FindExplosionInSector(s->sectnum) >= 0) { P_DoQuote(QUOTE_UNLOCKED,g_player[myconnectindex].ps);