jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gh:mfrancis95/chocolate-doom

Browse source
This commit is contained in:
Mike Swanson 2018-10-02 14:04:12 -07:00
commit b9416dc6f9
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doom/doomstat.h
View file

@ -228,7 +228,7 @@ extern mapthing_t* deathmatch_p;
// Player spawn spots.
extern mapthing_t playerstarts[MAXPLAYERS];
extern boolean playerstartsingame[MAXPLAYERS];
// Intermission stats.
// Parameters for world map / intermission.
extern wbstartstruct_t wminfo;

1
src/doom/p_mobj.c
View file

@ -788,6 +788,7 @@ void P_SpawnMapThing (mapthing_t* mthing)
{
// save spots for respawning in network games
playerstarts[mthing->type-1] = *mthing;
playerstartsingame[mthing->type-1] = true;
if (!deathmatch)
P_SpawnPlayer (mthing);

12
src/doom/p_setup.c
View file

@ -107,6 +107,7 @@ byte* rejectmatrix;
mapthing_t deathmatchstarts[MAX_DEATHMATCH_STARTS];
mapthing_t* deathmatch_p;
mapthing_t playerstarts[MAXPLAYERS];
boolean playerstartsingame[MAXPLAYERS];
@ -389,6 +390,17 @@ void P_LoadThings (int lump)
P_SpawnMapThing(&spawnthing);
}
if (!deathmatch)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !playerstartsingame[i])
{
I_Error("P_LoadThings: Player %d start missing (vanilla crashes here)", i + 1);
}
}
}
W_ReleaseLumpNum(lump);
}