zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- check for deathmatch starts before forcing an unfriendly player to use them.

Browse source
This commit is contained in:
Rachael Alexanderson 2018-02-20 05:35:18 -05:00
parent ff897997d6
commit 420602e154
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_setup.cpp
View file

@ -4138,15 +4138,18 @@ void P_SetupLevel (const char *lumpname, int position)
// [SP] move unfriendly players around
// horribly hacky - yes, this needs rewritten.
for (i = 0; i < MAXPLAYERS; ++i)
if (level.deathmatchstarts.Size () > 0)
{
if (playeringame[i] && players[i].mo != NULL)
for (i = 0; i < MAXPLAYERS; ++i)
{
if (!(players[i].mo->flags & MF_FRIENDLY))
if (playeringame[i] && players[i].mo != NULL)
{
AActor * oldSpawn = players[i].mo;
G_DeathMatchSpawnPlayer (i);
oldSpawn->Destroy();
if (!(players[i].mo->flags & MF_FRIENDLY))
{
AActor * oldSpawn = players[i].mo;
G_DeathMatchSpawnPlayer (i);
oldSpawn->Destroy();
}
}
}
}