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/gamedata/g_skill.cpp
View file

@ -76,6 +76,7 @@ void FMapInfoParser::ParseSkill ()
skill.RespawnLimit = 0;
skill.Aggressiveness = 1.;
skill.SpawnFilter = 0;
skill.SpawnMulti = false;
skill.ACSReturn = 0;
skill.MustConfirm = false;
skill.Shortcut = 0;
@ -192,6 +193,10 @@ void FMapInfoParser::ParseSkill ()
else if (sc.Compare("nightmare")) skill.SpawnFilter |= 16;
}
}
else if (sc.Compare ("spawnmulti"))
{
skill.SpawnMulti = true;
}
else if (sc.Compare("ACSReturn"))
{
ParseAssign();
@ -395,6 +400,8 @@ int G_SkillProperty(ESkillProperty prop)
case SKILLP_PlayerRespawn:
return AllSkills[gameskill].PlayerRespawn;
case SKILLP_SpawnMulti:
return AllSkills[gameskill].SpawnMulti;
}
}
return 0;