OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge tag 'g4.12.2'

Browse source
This commit is contained in:
Magnus Norddahl 2024-06-23 22:27:45 +02:00
commit 330ec45d84
26 changed files with 181 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_setup.cpp
View file

@ -506,6 +506,18 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
}
}
}
else if (newGame)
{
for (i = 0; i < MAXPLAYERS; ++i)
{
// Didn't have a player spawn available so spawn it now.
if (Level->PlayerInGame(i) && Level->Players[i]->playerstate == PST_ENTER && Level->Players[i]->mo == nullptr)
{
FPlayerStart* mthing = Level->PickPlayerStart(i);
Level->SpawnPlayer(mthing, i, (Level->flags2 & LEVEL2_PRERAISEWEAPON) ? SPF_WEAPONFULLYUP : 0);
}
}
}
// [SP] move unfriendly players around
// horribly hacky - yes, this needs rewritten.