OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Update scripting branch to trunk.

Browse source 
SVN r3758 (scripting)
This commit is contained in:
Randy Heit 2012-07-14 03:04:41 +00:00
commit 562cf04db2
614 changed files with 63691 additions and 31256 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/g_skill.cpp
View file

@ -66,6 +66,7 @@ void FMapInfoParser::ParseSkill ()
skill.FastMonsters = false;
skill.DisableCheats = false;
skill.EasyBossBrain = false;
skill.EasyKey = false;
skill.AutoUseHealth = false;
skill.RespawnCounter = 0;
skill.RespawnLimit = 0;
@ -125,6 +126,10 @@ void FMapInfoParser::ParseSkill ()
{
skill.EasyBossBrain = true;
}
else if (sc.Compare ("easykey"))
{
skill.EasyKey = true;
}
else if (sc.Compare("autousehealth"))
{
skill.AutoUseHealth = true;
@ -351,6 +356,9 @@ int G_SkillProperty(ESkillProperty prop)
case SKILLP_EasyBossBrain:
return AllSkills[gameskill].EasyBossBrain;
case SKILLP_EasyKey:
return AllSkills[gameskill].EasyKey;
case SKILLP_SpawnFilter:
return AllSkills[gameskill].SpawnFilter;
@ -428,6 +436,7 @@ FSkillInfo &FSkillInfo::operator=(const FSkillInfo &other)
DisableCheats = other.DisableCheats;
AutoUseHealth = other.AutoUseHealth;
EasyBossBrain = other.EasyBossBrain;
EasyKey = other.EasyKey;
RespawnCounter= other.RespawnCounter;
RespawnLimit= other.RespawnLimit;
Aggressiveness= other.Aggressiveness;