add battle royale player start wrapping
This commit is contained in:
parent
1f25a2b4a2
commit
65dec93f7c
2 changed files with 12 additions and 8 deletions
10
src/g_game.c
10
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)
|
||||
|
|
|
|||
10
src/p_mobj.c
10
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue