# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1629601629 14400
#      Sat Aug 21 23:07:09 2021 -0400
# Node ID 779ba0b5f5fd340d30e9f6e24efd0afff275ff2e
# Parent  865e4a3cf10fc31ea022dbc812df970302645d36
Changed some checks that are related to compat_noobituaries.

diff -r 865e4a3cf10f -r 779ba0b5f5fd src/cl_main.cpp
--- a/src/cl_main.cpp	Sat Aug 21 23:02:33 2021 -0400
+++ b/src/cl_main.cpp	Sat Aug 21 23:07:09 2021 -0400
@@ -3956,9 +3956,7 @@
 	}
 
 	// Finally, print the obituary string.
-	// [AK] Check if we shouldn't print the obituary due to ZADF_NO_OBITUARIES.
-	if (( zacompatflags & ZACOMPATF_NO_OBITUARIES ) == false )
-		ClientObituary( player->mo, inflictor, source, ( ulSourcePlayer < MAXPLAYERS ) ? DMG_PLAYERATTACK : 0, MOD );
+	ClientObituary( player->mo, inflictor, source, ( ulSourcePlayer < MAXPLAYERS ) ? DMG_PLAYERATTACK : 0, MOD );
 
 	// [BB] Restore the weapon the player actually is using now.
 	if ( ( ulSourcePlayer < MAXPLAYERS ) && ( players[ulSourcePlayer].ReadyWeapon != pSavedReadyWeapon ) )
diff -r 865e4a3cf10f -r 779ba0b5f5fd src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Aug 21 23:02:33 2021 -0400
+++ b/src/p_interaction.cpp	Sat Aug 21 23:07:09 2021 -0400
@@ -218,9 +218,13 @@
 	bool friendly;
 	int  gender;
 
+	// [AK] Check if we shouldn't print the obituary due to ZADF_NO_OBITUARIES or if the
+	// player was forced to dead spectators through ACS.
+	if ((zacompatflags & ZACOMPATF_NO_OBITUARIES) || MeansOfDeath == NAME_DeadSpectate)
+		return;
+
 	// No obituaries for non-players, voodoo dolls or when not wanted
-	// [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)
+	if (self->player == NULL || self->player->mo != self || !show_obituaries)
 		return;
 
 	gender = self->player->userinfo.GetGender();
@@ -951,8 +955,7 @@
 	}
 
 	// [RH] Death messages
-	// [AK] Also check if we shouldn't print the obituary due to ZADF_NO_OBITUARIES.
-	if (( player ) && ( NETWORK_InClientMode() == false ) && ( zacompatflags & ZACOMPATF_NO_OBITUARIES ) == false )
+	if (( player ) && ( NETWORK_InClientMode() == false ))
 		ClientObituary (this, inflictor, source, dmgflags, MeansOfDeath);
 
 }