zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added A_DamageSelf.

Browse source 
- A_DamageSelf(int amount, name damagetype)
This commit is contained in:
MajorCooke 2014-09-25 16:47:41 -05:00
parent 79d9a573bb
commit b1f87295b8
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/thingdef/thingdef_codeptr.cpp
View file

@ -3532,7 +3532,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfInTargetLOS)
//===========================================================================
//
// A_DamageMaster (int amount)
// A_DamageMaster (int amount, str damagetype)
// Damages the master of this child by the specified amount. Negative values heal.
//
//===========================================================================
@ -3558,7 +3558,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageMaster)
//===========================================================================
//
// A_DamageChildren (amount)
// A_DamageChildren (amount, str damagetype)
// Damages the children of this master by the specified amount. Negative values heal.
//
//===========================================================================
@ -3592,7 +3592,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageChildren)
//===========================================================================
//
// A_DamageSiblings (amount)
// A_DamageSiblings (int amount, str damagetype)
// Damages the siblings of this master by the specified amount. Negative values heal.
//
//===========================================================================
@ -4993,4 +4993,27 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetSpeed)
ACTION_PARAM_FIXED(speed, 0);
self->Speed = speed;
}
}
//===========================================================================
//
// A_DamageSelf (int amount, str damagetype)
// Damages the calling actor by the specified amount. Negative values heal.
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageSelf)
{
ACTION_PARAM_START(2);
ACTION_PARAM_INT(amount, 0);
ACTION_PARAM_NAME(DamageType, 1);
if (amount > 0)
{
P_DamageMobj(self, self, self, amount, DamageType, DMG_NO_ARMOR);
}
else if (amount < 0)
{
amount = -amount;
P_GiveBody(self, amount);
}
}

1
wadsrc/static/actors/actor.txt
View file

@ -304,6 +304,7 @@ ACTOR Actor native //: Thinker
action native A_SetDamageType(name damagetype);
action native A_DropItem(class<Actor> item, int dropamount = -1, int chance = 256);
action native A_SetSpeed(float speed);
action native A_DamageSelf(int amount, name damagetype = "none");
action native A_CheckSightOrRange(float distance, state label);
action native A_CheckRange(float distance, state label);