incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add battle royale player start wrapping

Browse source
This commit is contained in:
minenice55 2025-10-15 14:34:13 -04:00
parent 1f25a2b4a2
commit 65dec93f7c
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/g_game.c
View file

@ -3051,9 +3051,13 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
// Just spawn there. // Just spawn there.
//return playerstarts[0]; //return playerstarts[0];
if (doprints) //this section courtesy of fickle - v1.1 battle royale
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Race starts!\n")); // screw collision chex
return NULL; 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) if (modeattacking != ATTACKING_ITEMBREAK)

10
src/p_mobj.c
View file

@ -12794,11 +12794,11 @@ static boolean P_SpawnNonMobjMapThing(mapthing_t *mthing)
{ {
return true; // These are handled elsewhere. return true; // These are handled elsewhere.
} }
else if (mthing->type > MAXPLAYERS && mthing->type <= 32) // be wary of playerstarts size! playerstarts[MAXPLAYERS] // 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); // CONS_Alert(CONS_WARNING, "Excess player start detected %d\n", mthing->type);
return true; // return true;
} // }
return false; return false;
} }