# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1628171542 14400
#      Thu Aug 05 09:52:22 2021 -0400
# Node ID 5ec8a8a8ffca8f8d4f3aff31b907bce811854554
# Parent  29baecd4da905ed7314a1e8bbba9ec5252c87603
The chasecam is temporarily disabled while the local player is in free spectate mode.

diff -r 29baecd4da90 -r 5ec8a8a8ffca docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Mon Aug 02 19:43:28 2021 -0400
+++ b/docs/zandronum-history.txt	Thu Aug 05 09:52:22 2021 -0400
@@ -110,6 +110,7 @@
 !	- A player's health on the coop info or target identification is now color coded based on percentage and not hardcoded numbers. Also added orange as a color to indicate when a player's health is between 26-50%. [Kaminsky]
 !	- The name of the server and the current game mode are now shown on the scoreboard's header. [Kaminsky]
 !	- Color codes are now omitted from the length of the player's name, allowing for more complex color schemes without reaching the limit. There's still a technical limitation so that names aren't too long when sent across the network. [Kaminsky]
+!	- The chasecam is temporarily disabled while the local player is in free spectate mode. [Kaminsky]
 
 
 3.0.1
diff -r 29baecd4da90 -r 5ec8a8a8ffca src/gl/scene/gl_scene.cpp
--- a/src/gl/scene/gl_scene.cpp	Mon Aug 02 19:43:28 2021 -0400
+++ b/src/gl/scene/gl_scene.cpp	Thu Aug 05 09:52:22 2021 -0400
@@ -880,6 +880,8 @@
 //
 //-----------------------------------------------------------------------------
 
+extern bool CLIENTDEMO_IsInFreeSpectateMode(); // [AK]
+
 sector_t * FGLRenderer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, float fov, float ratio, float fovratio, bool mainview, bool toscreen)
 {       
 	// [BB] Check if stereo rendering is supported.
@@ -901,7 +903,10 @@
 
 
 	// [BB] consoleplayer should be able to toggle the chase cam.
+	// [AK] Don't use the chase cam if they're in free spectate mode.
 	if (camera->player && /*camera->player-players==consoleplayer &&*/
+		(CLIENTDEMO_IsInFreeSpectateMode() == false) &&
+		(camera->player - players != consoleplayer || players[consoleplayer].bSpectating == false) &&
 		((/*camera->player->*/players[consoleplayer].cheats & CF_CHASECAM) || (r_deathcamera && camera->health <= 0)) && camera==camera->player->mo)
 	{
 		mViewActor=NULL;
diff -r 29baecd4da90 -r 5ec8a8a8ffca src/r_utility.cpp
--- a/src/r_utility.cpp	Mon Aug 02 19:43:28 2021 -0400
+++ b/src/r_utility.cpp	Thu Aug 05 09:52:22 2021 -0400
@@ -790,7 +790,10 @@
 	}
 
 	// [BB] consoleplayer should be able to toggle the chase cam.
+	// [AK] Don't use the chase cam if they're in free spectate mode.
 	if (player != NULL && gamestate != GS_TITLELEVEL &&
+		(CLIENTDEMO_IsInFreeSpectateMode() == false) && 
+		(camera->player - players != consoleplayer || players[consoleplayer].bSpectating == false) &&
 		((/*player->*/players[consoleplayer].cheats & CF_CHASECAM) || (r_deathcamera && camera->health <= 0)))
 	{
 		// [RH] Use chasecam view