OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2024-09-11 00:11:39 +08:00
commit fa0a88f85e
41 changed files with 236 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/playsim/p_mobj.cpp
View file

@ -5757,6 +5757,7 @@ AActor *FLevelLocals::SpawnMapThing (FMapThing *mthing, int position)
AActor *mobj;
bool spawnmulti = G_SkillProperty(SKILLP_SpawnMulti) || !!(dmflags2 & DF2_ALWAYS_SPAWN_MULTI);
bool spawnmulti_cooponly = G_SkillProperty(SKILLP_SpawnMultiCoopOnly);
if (mthing->EdNum == 0 || mthing->EdNum == -1)
return NULL;
@ -5837,9 +5838,9 @@ AActor *FLevelLocals::SpawnMapThing (FMapThing *mthing, int position)
{
mask = MTF_COOPERATIVE;
}
else if (spawnmulti)
else if (spawnmulti || spawnmulti_cooponly)
{
mask = MTF_COOPERATIVE|MTF_SINGLE;
mask = spawnmulti_cooponly ? MTF_COOPERATIVE : (MTF_COOPERATIVE|MTF_SINGLE);
}
else
{