# HG changeset patch
# User Adam Kaminski
# Date 1603661451 14400
#      Sun Oct 25 17:30:51 2020 -0400
# Node ID e5603c6394ee9fe5554cf2ea52630ce7bd458d09
# Parent  1d7faab82baa159add79dd3f02d579534c9ffb29
Fixed the obituary for the BFG tracer not being used if a player was killed by them.

diff -r 1d7faab82baa -r e5603c6394ee docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Mon Jul 20 23:31:14 2020 +0300
+++ b/docs/zandronum-history.txt	Sun Oct 25 17:30:51 2020 -0400
@@ -33,6 +33,7 @@
 -	- Fixed: Bots DH_ARRAYSET implementation is wrong. [sleep]
 -	- Fixed jittery model interpolation, partly based on dpJudas's fix for GZDoom. [StrikerMan780]
 -	- Fixed an integer overflow crash related to decals. [eagle, Torr Samaho]
+-	- Fixed the obituary for the BFG tracer not being used if a player was killed by them. [Kaminsky]
 !	- sv_forcegldefaults renamed to sv_forcevideodefaults. The old name still exists for compatibility. [Dusk]
 !	- r_3dfloors is now forced to be true when sv_forcevideodefaults is true. [Dusk]
 !	- When the wad authentication fails for a connecting client, the client only reports the missing and incompatible PWADS instead of all of them. [Pol Marcet]
diff -r 1d7faab82baa -r e5603c6394ee src/p_interaction.cpp
--- a/src/p_interaction.cpp	Mon Jul 20 23:31:14 2020 +0300
+++ b/src/p_interaction.cpp	Sun Oct 25 17:30:51 2020 -0400
@@ -325,7 +325,10 @@
 
 			if (message == NULL)
 			{
-				if (inflictor != NULL)
+				// [AK] We must also check if the actor inflicting the damage isn't also
+				// the attacker. This ensures obituaries for the BFG9000's tracer or railgun
+				// attacks are used first instead of the one defined in the player's class.
+				if (inflictor != NULL && inflictor != attacker)
 				{
 					message = inflictor->GetClass()->Meta.GetMetaString (AMETA_Obituary);
 				}