OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Xaser's submission for no impact damage from blasting.

Browse source 
SVN r3693 (trunk)
This commit is contained in:
Christoph Oelckers 2012-06-16 09:01:05 +00:00
commit 37d9519673
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/g_hexen/a_blastradius.cpp
View file

@ -22,7 +22,7 @@
//
//==========================================================================
void BlastActor (AActor *victim, fixed_t strength, fixed_t speed, AActor * Owner, const PClass * blasteffect)
void BlastActor (AActor *victim, fixed_t strength, fixed_t speed, AActor * Owner, const PClass * blasteffect, bool dontdamage)
{
angle_t angle,ang;
AActor *mo;
@ -67,7 +67,7 @@ void BlastActor (AActor *victim, fixed_t strength, fixed_t speed, AActor * Owner
{
// Players handled automatically
}
else
else if (!dontdamage)
{
victim->flags2 |= MF2_BLASTED;
}
@ -83,6 +83,7 @@ enum
BF_USEAMMO = 1,
BF_DONTWARN = 2,
BF_AFFECTBOSSES = 4,
BF_NOIMPACTDAMAGE = 8,
};
//==========================================================================
@ -145,6 +146,6 @@ DEFINE_ACTION_FUNCTION_PARAMS (AActor, A_Blast)
{ // Out of range
continue;
}
BlastActor (mo, strength, speed, self, blasteffect);
BlastActor (mo, strength, speed, self, blasteffect, !!(blastflags & BF_NOIMPACTDAMAGE));
}
}