zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added DMSS_NOFACTOR for all A_Damage functions.

This commit is contained in:
MajorCooke 2014-10-02 11:48:07 -05:00
parent 7a6e704af6
commit 5030832df0
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/thingdef/thingdef_codeptr.cpp
View File

@ -4830,6 +4830,7 @@ enum DMSS
DMSS_FOILINVUL = 1,
DMSS_AFFECTARMOR = 2,
DMSS_KILL = 4,
DMSS_NOFACTOR = 8,
};
static void DoDamage(AActor *dmgtarget, AActor *self, int amount, FName DamageType, int flags)
@ -4844,15 +4845,29 @@ static void DoDamage(AActor *dmgtarget, AActor *self, int amount, FName DamageTy
}
if (flags & DMSS_AFFECTARMOR)
{
P_DamageMobj(dmgtarget, self, self, amount, DamageType, DMG_FOILINVUL);
if (flags & DMSS_NOFACTOR)
{
P_DamageMobj(dmgtarget, self, self, amount, DamageType, DMG_FOILINVUL | DMG_NO_FACTOR);
}
else
{
P_DamageMobj(dmgtarget, self, self, amount, DamageType, DMG_FOILINVUL);
}
}
else
{
if (flags & DMSS_NOFACTOR)
{
P_DamageMobj(dmgtarget, self, self, amount, DamageType, DMG_FOILINVUL | DMG_NO_ARMOR | DMG_NO_FACTOR);
}
//[MC] DMG_FOILINVUL is needed for making the damage occur on the actor.
else
{
P_DamageMobj(dmgtarget, self, self, amount, DamageType, DMG_FOILINVUL | DMG_NO_ARMOR);
}
}
}
}
else if (amount < 0)
{
amount = -amount;
@ -5128,11 +5143,13 @@ static void DoRemove(AActor *removetarget, int flags)
// A_RemoveTarget
//
//===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RemoveTarget)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveTarget)
{
if ((self->target != NULL))
ACTION_PARAM_START(1);
ACTION_PARAM_INT(flags, 0);
if (self->master != NULL)
{
P_RemoveThing(self->target);
DoRemove(self->target, flags);
}
}
@ -5141,11 +5158,13 @@ DEFINE_ACTION_FUNCTION(AActor, A_RemoveTarget)
// A_RemoveTracer
//
//===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_RemoveTracer)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveTracer)
{
if ((self->tracer != NULL))
ACTION_PARAM_START(1);
ACTION_PARAM_INT(flags, 0);
if (self->master != NULL)
{
P_RemoveThing(self->tracer);
DoRemove(self->tracer, flags);
}
}

1
wadsrc/static/actors/constants.txt
View File

@ -375,6 +375,7 @@ const int KILS_NOMONSTERS = 4;
const int DMSS_FOILINVUL = 1;
const int DMSS_AFFECTARMOR = 2;
const int DMSS_KILL = 4;
const int DMSS_NOFACTOR = 8;
// Flags for A_AlertMonsters
const int AMF_TARGETEMITTER = 1;