# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1606571172 18000
#      Sat Nov 28 08:46:12 2020 -0500
# Node ID 88c9bdf3076280ce36653903a0d73f0f9172f55c
# Parent  fc51a53af3bd72b2a67c62ec537e6ced64512eb6
SetDeadSpectator no longer prints an obituary message if a live player is forced to dead spectators.

diff -r fc51a53af3bd -r 88c9bdf30762 src/namedef.h
--- a/src/namedef.h	Sat Nov 28 08:21:16 2020 -0500
+++ b/src/namedef.h	Sat Nov 28 08:46:12 2020 -0500
@@ -275,6 +275,7 @@
 xx(BFG10k)
 xx(SpawnTelefrag)
 xx(Reflection)
+xx(DeadSpectate)
 
 // Special names for thingdef_exp.cpp
 xx(Random)
diff -r fc51a53af3bd -r 88c9bdf30762 src/p_acs.cpp
--- a/src/p_acs.cpp	Sat Nov 28 08:21:16 2020 -0500
+++ b/src/p_acs.cpp	Sat Nov 28 08:46:12 2020 -0500
@@ -7066,7 +7066,7 @@
 					// [BB] If still alive, kill the player before turning him into a dead spectator.
 					if ( players[ulPlayer].mo && players[ulPlayer].mo->health > 0 )
 					{
-						P_DamageMobj(players[ulPlayer].mo, NULL, NULL, TELEFRAG_DAMAGE, NAME_Telefrag, DMG_THRUSTLESS);
+						P_DamageMobj(players[ulPlayer].mo, NULL, NULL, TELEFRAG_DAMAGE, NAME_DeadSpectate, DMG_THRUSTLESS);
 						// [BB] The name prefix is misleading, this function is not client specific.
 						CLIENT_SetActorToLastDeathStateFrame ( players[ulPlayer].mo );
 					}
diff -r fc51a53af3bd -r 88c9bdf30762 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Nov 28 08:21:16 2020 -0500
+++ b/src/p_interaction.cpp	Sat Nov 28 08:46:12 2020 -0500
@@ -221,7 +221,8 @@
 	char	szVictim[MAXPLAYERNAME+1+4];
 
 	// No obituaries for non-players, voodoo dolls or when not wanted
-	if (self->player == NULL || self->player->mo != self || !show_obituaries)
+	// [AK] Added a check if the player was forced as a dead spectator through ACS.
+	if (self->player == NULL || self->player->mo != self || !show_obituaries || MeansOfDeath == NAME_DeadSpectate)
 		return;
 
 	gender = self->player->userinfo.GetGender();