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

Merge branch 'blankart-dev' into portv1objects

Browse source
This commit is contained in:
NepDisk 2025-04-13 08:52:23 -04:00
commit 976495df59
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/g_game.c
View file

@ -2817,15 +2817,29 @@ mapthing_t *G_FindBattleStart(INT32 playernum)
if (numdmstarts)
{
for (j = 0; j < 64; j++)
if (modeattacking == ATTACKING_ITEMBREAK)
{
i = P_RandomKey(numdmstarts);
if (G_CheckSpot(playernum, deathmatchstarts[i]))
return deathmatchstarts[i];
if (G_CheckSpot(playernum, deathmatchstarts[0]))
return deathmatchstarts[0];
if (doprints)
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Deathmatch starts for Item Breaker!\n"));
return NULL;
}
else
{
for (j = 0; j < 64; j++)
{
i = P_RandomKey(numdmstarts);
if (G_CheckSpot(playernum, deathmatchstarts[i]))
return deathmatchstarts[i];
}
if (doprints)
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Deathmatch starts!\n"));
return NULL;
}
if (doprints)
CONS_Alert(CONS_WARNING, M_GetText("Could not spawn at any Deathmatch starts!\n"));
return NULL;
}
if ((gametyperules & GTR_BATTLESTARTS) && doprints)
@ -2922,8 +2936,11 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
return NULL;
}
if (doprints)
CONS_Alert(CONS_WARNING, M_GetText("No Race starts in this map!\n"));
if (modeattacking != ATTACKING_ITEMBREAK)
{
if (doprints)
CONS_Alert(CONS_WARNING, M_GetText("No Race starts in this map!\n"));
}
return NULL;
}