OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Converted Strife's Acolytes, Rebels, Sentinel, Reaver and Templar to

Browse source 
DECORATE.


SVN r1113 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-05 17:58:38 +00:00
commit fe2e64aa40
19 changed files with 618 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/thingdef/thingdef_codeptr.cpp
View file

@ -606,8 +606,9 @@ void A_ExplodeParms (AActor *self)
int damage;
int distance;
bool hurtSource;
bool alert;
int index=CheckIndex(3);
int index=CheckIndex(4);
if (index>=0)
{
damage = EvalExpressionI (StateParameters[index], self);
@ -615,12 +616,14 @@ void A_ExplodeParms (AActor *self)
hurtSource = EvalExpressionN (StateParameters[index+2], self);
if (damage == 0) damage = 128;
if (distance == 0) distance = damage;
alert = !!EvalExpressionI (StateParameters[index+3], self);
}
else
{
damage = self->GetClass()->Meta.GetMetaInt (ACMETA_ExplosionDamage, 128);
distance = self->GetClass()->Meta.GetMetaInt (ACMETA_ExplosionRadius, damage);
hurtSource = !self->GetClass()->Meta.GetMetaInt (ACMETA_DontHurtShooter);
alert = false;
}
P_RadiusAttack (self, self->target, damage, distance, self->DamageType, hurtSource);
@ -628,9 +631,13 @@ void A_ExplodeParms (AActor *self)
{
P_HitFloor (self);
}
if (alert && self->target != NULL && self->target->player != NULL)
{
validcount++;
P_RecursiveSound (self->Sector, self->target, false, 0);
}
}
//==========================================================================
//
// A_RadiusThrust