zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-04 00:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add GetSelfObituary

Browse source
This commit is contained in:
f7cjo 2025-02-16 16:16:02 +01:00 committed by Ricardo Luís Vaz Silva
parent b54da619ad
commit f1e6445e82
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/playsim/p_interaction.cpp
View file

@ -244,7 +244,16 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
{
if (attacker == self)
{
message = "$OB_KILLEDSELF";
messagename = "$OB_KILLEDSELF";
IFVIRTUALPTR(self, AActor, GetSelfObituary)
{
VMValue params[] = { self, inflictor, mod.GetIndex() };
VMReturn rett(&ret);
VMCall(func, params, countof(params), &rett, 1);
if (ret.IsNotEmpty()) message = ret.GetChars();
}
}
else
{

7
wadsrc/static/zscript/actors/actor.zs
View file

@ -287,6 +287,7 @@ class Actor : Thinker native
meta String Obituary; // Player was killed by this actor
meta String HitObituary; // Player was killed by this actor in melee
meta String SelfObituary; // Player killed himself using this actor
meta double DeathHeight; // Height on normal death
meta double BurnHeight; // Height on burning death
meta int GibHealth; // Negative health below which this monster dies an extreme death
@ -313,6 +314,7 @@ class Actor : Thinker native
Property prefix: none;
Property Obituary: Obituary;
Property HitObituary: HitObituary;
Property SelfObituary: SelfObituary;
Property MeleeDamage: MeleeDamage;
Property MeleeSound: MeleeSound;
Property MissileHeight: MissileHeight;
@ -693,6 +695,11 @@ class Actor : Thinker native
}
return Obituary;
}
virtual String GetSelfObituary(Actor inflictor, Name mod)
{
return SelfObituary;
}
virtual int OnDrain(Actor victim, int damage, Name dmgtype)
{

16
wadsrc/static/zscript/actors/player/player.zs
View file

@ -317,6 +317,22 @@ class PlayerPawn : Actor
return message;
}
}
override String GetSelfObituary(Actor inflictor, Name mod)
{
String message;
if (inflictor && inflictor != self)
{
message = inflictor.GetSelfObituary(inflictor, mod);
}
if (message.Length() == 0)
{
message = SelfObituary;
}
return message;
}
//----------------------------------------------------------------------------
//