From 65dec93f7cd37cecd56ec9350e5803851ee384d9 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Wed, 15 Oct 2025 14:34:13 -0400 Subject: [PATCH] add battle royale player start wrapping --- src/g_game.c | 10 +++++++--- src/p_mobj.c | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index c9224d710..fa13030d7 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3051,9 +3051,13 @@ mapthing_t *G_FindRaceStart(INT32 playernum) // Just spawn there. //return playerstarts[0]; - if (doprints) - CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Race starts!\n")); - return NULL; + //this section courtesy of fickle - v1.1 battle royale + // screw collision chex + return playerstarts[pos % numcoopstarts]; + + // if (doprints) + // CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Race starts!\n")); + // return NULL; } if (modeattacking != ATTACKING_ITEMBREAK) diff --git a/src/p_mobj.c b/src/p_mobj.c index 094a2b720..bc6b0b4bf 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12794,11 +12794,11 @@ static boolean P_SpawnNonMobjMapThing(mapthing_t *mthing) { return true; // These are handled elsewhere. } - else if (mthing->type > MAXPLAYERS && mthing->type <= 32) // be wary of playerstarts size! playerstarts[MAXPLAYERS] - { - CONS_Alert(CONS_WARNING, "Excess player start detected %d\n", mthing->type); - return true; - } + // else if (mthing->type > MAXPLAYERS && mthing->type <= 32) // be wary of playerstarts size! playerstarts[MAXPLAYERS] + // { + // CONS_Alert(CONS_WARNING, "Excess player start detected %d\n", mthing->type); + // return true; + // } return false; }