OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added the usable parts of Rachael's 'Spawnmulti' spawn flag PR.

Browse source 
This needed a small fix in SpawnMapThing to apply the correct flags for Hexen format maps.
This commit is contained in:
Christoph Oelckers 2020-10-25 15:57:43 +01:00
commit 3bd365f934
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/playsim/p_mobj.cpp
View file

@ -5354,7 +5354,6 @@ AActor *FLevelLocals::SpawnPlayer (FPlayerStart *mthing, int playernum, int flag
return mobj;
}
//
// P_SpawnMapThing
// The fields of the mapthing should
@ -5367,6 +5366,8 @@ AActor *FLevelLocals::SpawnMapThing (FMapThing *mthing, int position)
int mask;
AActor *mobj;
bool spawnmulti = G_SkillProperty(SKILLP_SpawnMulti) || multiplayer;
if (mthing->EdNum == 0 || mthing->EdNum == -1)
return NULL;
@ -5446,6 +5447,10 @@ AActor *FLevelLocals::SpawnMapThing (FMapThing *mthing, int position)
{
mask = MTF_COOPERATIVE;
}
else if (spawnmulti)
{
mask = MTF_COOPERATIVE|MTF_SINGLE;
}
else
{
mask = MTF_SINGLE;