zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a damage type parameter to A_KillChildren, A_KillMaster, and

Browse source 
A_KillSiblings. 


SVN r2023 (trunk)
This commit is contained in:
Randy Heit 2009-12-13 04:59:19 +00:00
parent 2fb2c79887
commit b3d2a1f074
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
December 12, 2009
- Added a damage type parameter to A_KillChildren, A_KillMaster, and
A_KillSiblings.
December 11, 2009 (Changes by Graf Zahl) December 11, 2009 (Changes by Graf Zahl)
- fixed: Auto-COMPAT_SHORTTEX for IWADs must be set per IWAD, not in general - fixed: Auto-COMPAT_SHORTTEX for IWADs must be set per IWAD, not in general
for Doom. for Doom.

25
src/thingdef/thingdef_codeptr.cpp
View file

@ -1951,11 +1951,14 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIf)
// A_KillMaster // A_KillMaster
// //
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_KillMaster) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_KillMaster)
{ {
ACTION_PARAM_START(1);
ACTION_PARAM_NAME(damagetype, 0);
if (self->master != NULL) if (self->master != NULL)
{ {
P_DamageMobj(self->master, self, self, self->master->health, NAME_None, DMG_NO_ARMOR); P_DamageMobj(self->master, self, self, self->master->health, damagetype, DMG_NO_ARMOR);
} }
} }
@ -1964,16 +1967,19 @@ DEFINE_ACTION_FUNCTION(AActor, A_KillMaster)
// A_KillChildren // A_KillChildren
// //
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_KillChildren) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_KillChildren)
{ {
ACTION_PARAM_START(1);
ACTION_PARAM_NAME(damagetype, 0);
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor *mo;
while ( (mo = it.Next()) ) while ( (mo = it.Next()) )
{ {
if (mo->master == self) if (mo->master == self)
{ {
P_DamageMobj(mo, self, self, mo->health, NAME_None, DMG_NO_ARMOR); P_DamageMobj(mo, self, self, mo->health, damagetype, DMG_NO_ARMOR);
} }
} }
} }
@ -1983,16 +1989,19 @@ DEFINE_ACTION_FUNCTION(AActor, A_KillChildren)
// A_KillSiblings // A_KillSiblings
// //
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_KillSiblings) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_KillSiblings)
{ {
ACTION_PARAM_START(1);
ACTION_PARAM_NAME(damagetype, 0);
TThinkerIterator<AActor> it; TThinkerIterator<AActor> it;
AActor * mo; AActor *mo;
while ( (mo = it.Next()) ) while ( (mo = it.Next()) )
{ {
if (mo->master == self->master && mo != self) if (mo->master == self->master && mo != self)
{ {
P_DamageMobj(mo, self, self, mo->health, NAME_None, DMG_NO_ARMOR); P_DamageMobj(mo, self, self, mo->health, damagetype, DMG_NO_ARMOR);
} }
} }
} }

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

@ -209,9 +209,9 @@ ACTOR Actor native //: Thinker
action native A_RemoveMaster(); action native A_RemoveMaster();
action native A_RemoveChildren(bool removeall = false); action native A_RemoveChildren(bool removeall = false);
action native A_RemoveSiblings(bool removeall = false); action native A_RemoveSiblings(bool removeall = false);
action native A_KillMaster(); action native A_KillMaster(name damagetype = "none");
action native A_KillChildren(); action native A_KillChildren(name damagetype = "none");
action native A_KillSiblings(); action native A_KillSiblings(name damagetype = "none");
action native A_RaiseMaster(); action native A_RaiseMaster();
action native A_RaiseChildren(); action native A_RaiseChildren();
action native A_RaiseSiblings(); action native A_RaiseSiblings();