OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added ACS CheckActprClass function

Browse source 
- fixed: When a blasted actor collided with another one this other actor's
  DONTBLAST flag was not checked.
- added a global DamageFactor actor property. All damage this actor takes is multiplied
  by this factor in addition to damage type specific damage factors.


SVN r1915 (trunk)
This commit is contained in:
Christoph Oelckers 2009-10-15 20:09:22 +00:00
commit ce2e85c7b2
7 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/thingdef/thingdef_properties.cpp
View file

@ -924,18 +924,25 @@ DEFINE_PROPERTY(damagetype, S, Actor)
//==========================================================================
//
//==========================================================================
DEFINE_PROPERTY(damagefactor, SF, Actor)
DEFINE_PROPERTY(damagefactor, ZF, Actor)
{
PROP_STRING_PARM(str, 0);
PROP_FIXED_PARM(id, 1);
if (info->DamageFactors == NULL) info->DamageFactors=new DmgFactors;
if (str == NULL)
{
defaults->DamageFactor = id;
}
else
{
if (info->DamageFactors == NULL) info->DamageFactors=new DmgFactors;
FName dmgType;
if (!stricmp(str, "Normal")) dmgType = NAME_None;
else dmgType=str;
FName dmgType;
if (!stricmp(str, "Normal")) dmgType = NAME_None;
else dmgType=str;
(*info->DamageFactors)[dmgType]=id;
(*info->DamageFactors)[dmgType]=id;
}
}
//==========================================================================