提交: 8fbf8a42540699951ac989e1a26e5ed753ddb18c - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

Commit MetaInfo

• 修訂: 8fbf8a42540699951ac989e1a26e5ed753ddb18c (tree)
• 時間: 2022-08-22 04:06:37
• 作者: Sean Baggaley <sean@csnx...>
• Commiter: Sean Baggaley

Log Message

- Added a new SelfObituary actor property for when a player kills themselves with an actor.
- Replaced Skulltag's hardcoded self obituaries for the BFG10K and Grenades with the SelfObituary property.

Change Summary

• modified: src/actor.h
• modified: src/namedef.h
• modified: src/p_interaction.cpp
• modified: src/thingdef/thingdef_properties.cpp
• modified: wadsrc/static/actors/doom/doomweapons.txt
• modified: wadsrc_st/static/actors/skulltagweapons.txt

差異

diff -r e25ec33a7694 -r 8fbf8a425406 src/actor.h
--- a/src/actor.h	Sat Aug 20 23:11:34 2022 -0400
+++ b/src/actor.h	Sun Aug 21 20:06:37 2022 +0100
@@ -676,6 +676,7 @@
 	AMETA_BloodType,		// Blood replacement type
 	AMETA_BloodType2,		// Bloodsplatter replacement type
 	AMETA_BloodType3,		// AxeBlood replacement type
+	AMETA_SelfObituary,		// [SB] Used when a player kills themselves with this actor
 };
 
 struct FDropItem 

diff -r e25ec33a7694 -r 8fbf8a425406 src/namedef.h
--- a/src/namedef.h	Sat Aug 20 23:11:34 2022 -0400
+++ b/src/namedef.h	Sun Aug 21 20:06:37 2022 +0100
@@ -271,8 +271,6 @@
 xx(Cast) // 'damage type' for the cast call
 
 // [BB] Skulltag Damage types
-xx(Grenade)
-xx(BFG10k)
 xx(SpawnTelefrag)
 xx(Reflection)
 xx(DeadSpectate)

diff -r e25ec33a7694 -r 8fbf8a425406 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Aug 20 23:11:34 2022 -0400
+++ b/src/p_interaction.cpp	Sun Aug 21 20:06:37 2022 +0100
@@ -273,17 +273,26 @@
 	{
 		if (attacker == self)
 		{
-			// [BB] Added switch here.
-			switch (mod)
-			{
-			// [BC] Obituaries for killing yourself with Skulltag weapons.
-			case NAME_Grenade:	messagename = "OB_GRENADE_SELF";	break;
-			case NAME_BFG10k:	messagename = "OB_BFG10K_SELF";		break;
-			}
 			if (messagename != NULL)
 				message = GStrings(messagename);
 			else
-				message = GStrings("OB_KILLEDSELF");
+			{
+				// [SB] Replaced Skulltag's hardcoded obituaries for killing oneself with
+				// the BFG 10k and grenades with a new SelfObituary property.
+				if (inflictor != NULL && inflictor != attacker)
+				{
+					message = inflictor->GetClass()->Meta.GetMetaString (AMETA_SelfObituary);
+				}
+				// [SB] Just in case the player somehow manages to shoot themselves...
+				if (message == NULL && (dmgflags & DMG_PLAYERATTACK) && attacker->player->ReadyWeapon != NULL)
+				{
+					message = attacker->player->ReadyWeapon->GetClass()->Meta.GetMetaString (AMETA_SelfObituary);
+				}
+				if (message == NULL)
+				{
+					message = GStrings("OB_KILLEDSELF");
+				}
+			}
 		}
 		else if (attacker->player == NULL)
 		{

diff -r e25ec33a7694 -r 8fbf8a425406 src/thingdef/thingdef_properties.cpp
--- a/src/thingdef/thingdef_properties.cpp	Sat Aug 20 23:11:34 2022 -0400
+++ b/src/thingdef/thingdef_properties.cpp	Sun Aug 21 20:06:37 2022 +0100
@@ -848,6 +848,15 @@
 }
 
 //==========================================================================
+// [SB]
+//==========================================================================
+DEFINE_PROPERTY(selfobituary, S, Actor)
+{
+	PROP_STRING_PARM(str, 0);
+	info->Class->Meta.SetMetaString (AMETA_SelfObituary, str);
+}
+
+//==========================================================================
 //
 //==========================================================================
 DEFINE_PROPERTY(donthurtshooter, 0, Actor)

diff -r e25ec33a7694 -r 8fbf8a425406 wadsrc/static/actors/doom/doomweapons.txt
--- a/wadsrc/static/actors/doom/doomweapons.txt	Sat Aug 20 23:11:34 2022 -0400
+++ b/wadsrc/static/actors/doom/doomweapons.txt	Sun Aug 21 20:06:37 2022 +0100
@@ -381,6 +381,7 @@
 	SeeSound "weapons/grenlf"
 	DeathSound "weapons/grenlx"
 	Obituary "$OB_GRENADE"
+	SelfObituary "$OB_GRENADE_SELF" // [SB]
 	DamageType Grenade
 
 	States

diff -r e25ec33a7694 -r 8fbf8a425406 wadsrc_st/static/actors/skulltagweapons.txt
--- a/wadsrc_st/static/actors/skulltagweapons.txt	Sat Aug 20 23:11:34 2022 -0400
+++ b/wadsrc_st/static/actors/skulltagweapons.txt	Sun Aug 21 20:06:37 2022 +0100
@@ -138,6 +138,7 @@
 	Weapon.AmmoType "Cell"
 	Weapon.Kickback 100
 	Inventory.Pickupmessage "$PICKUP_BFG10K"
+	SelfObituary "$OB_BFG10K_SELF" // [SB]
 	+WEAPON.NOAUTOFIRE
 	+WEAPON.NOLMS
 	States
@@ -217,6 +218,7 @@
 	SeeSound "weapons/bfg10kx"
 	AttackSound "weapons/bfg10kx"
 	Obituary "$OB_BFG10K"
+	SelfObituary "$OB_BFG10K_SELF" // [SB]
 	States
 	{
 	Spawn:
@@ -247,6 +249,7 @@
 	Weapon.AmmoType "RocketAmmo"
 	Weapon.Kickback 100
 	Inventory.PickupMessage "$PICKUP_GRENADELAUNCHER"
+	SelfObituary "$OB_GRENADE_SELF" // [SB]
 
 	States
 	{