OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Monster reaction time was always zero with fast monsters and not just on nightmare.

Browse source
This commit is contained in:
drfrag 2021-01-12 23:37:45 +01:00 • committed by Rachael Alexanderson
commit 4ff72e937f
8 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gamedata/g_skill.cpp
View file

@ -77,6 +77,7 @@ void FMapInfoParser::ParseSkill ()
skill.Aggressiveness = 1.;
skill.SpawnFilter = 0;
skill.SpawnMulti = false;
skill.InstantReaction = false;
skill.ACSReturn = 0;
skill.MustConfirm = false;
skill.Shortcut = 0;
@ -197,6 +198,10 @@ void FMapInfoParser::ParseSkill ()
{
skill.SpawnMulti = true;
}
else if (sc.Compare ("InstantReaction"))
{
skill.InstantReaction = true;
}
else if (sc.Compare("ACSReturn"))
{
ParseAssign();
@ -400,8 +405,12 @@ int G_SkillProperty(ESkillProperty prop)
case SKILLP_PlayerRespawn:
return AllSkills[gameskill].PlayerRespawn;
case SKILLP_SpawnMulti:
return AllSkills[gameskill].SpawnMulti;
case SKILLP_InstantReaction:
return AllSkills[gameskill].InstantReaction;
}
}
return 0;
@ -540,6 +549,7 @@ FSkillInfo &FSkillInfo::operator=(const FSkillInfo &other)
Aggressiveness= other.Aggressiveness;
SpawnFilter = other.SpawnFilter;
SpawnMulti = other.SpawnMulti;
InstantReaction = other.InstantReaction;
ACSReturn = other.ACSReturn;
MenuName = other.MenuName;
PicName = other.PicName;