# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1626734407 14400
#      Mon Jul 19 18:40:07 2021 -0400
# Node ID 6d0791e89b895c95a9fe8ec09de9f150b160c8eb
# Parent  fd6a187669458d52300d9848d3b3c78513648559
Fixed a player's old body from being frozen and not finishing their animation when they become a dead spectator.

diff -r fd6a18766945 -r 6d0791e89b89 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Mon Jul 19 20:48:00 2021 -0400
+++ b/docs/zandronum-history.txt	Mon Jul 19 18:40:07 2021 -0400
@@ -88,6 +88,7 @@
 -	- The console and chat no longer opens or closes while the user is holding down the grave or enter keys. This makes it extremely difficult to flicker the console or chat icons and trigger client command floods. [Kaminsky]
 -	- Fixed "####" and "----" in PlayerPawns. [Zandrewnum]
 -	- Fixed dormant sounds from still playing upon resetting the map. [Kaminsky]
+-	- Fixed a player's old body from being frozen and not finishing their animation when they become a dead spectator. [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 fd6a18766945 -r 6d0791e89b89 src/p_mobj.cpp
--- a/src/p_mobj.cpp	Mon Jul 19 20:48:00 2021 -0400
+++ b/src/p_mobj.cpp	Mon Jul 19 18:40:07 2021 -0400
@@ -5835,6 +5835,12 @@
 	// [Spleen] Reset reconciliation buffer when player gets spawned
 	UNLAGGED_ResetPlayer( p );
 
+	// [AK] If the player is supposed to be a dead spectator, disassociate them
+	// from the old body. This prevents the old body from being frozen and not
+	// finishing their animation when they become a spectator.
+	if (( p->bDeadSpectator ) && ( oldactor != NULL ) && ( oldactor->player == p ))
+		oldactor->player = NULL;
+
 	return mobj;
 }