From f278491d86cabcc311a8047778693d4f39e7e6eb Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Mon, 20 Sep 2021 22:10:34 -0500
Subject: [PATCH] Fixed point_viewcontrol "Don't set player view" keyvalue not
 working properly

---
 sp/src/game/server/triggers.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/sp/src/game/server/triggers.cpp b/sp/src/game/server/triggers.cpp
index 37f5c19b..2361f8fa 100644
--- a/sp/src/game/server/triggers.cpp
+++ b/sp/src/game/server/triggers.cpp
@@ -3497,12 +3497,14 @@ void CTriggerCamera::Enable( void )
 #ifdef MAPBASE
 	if (!m_bDontSetPlayerView)
 #endif
-	pPlayer->SetViewEntity( this );
-
-	// Hide the player's viewmodel
-	if ( pPlayer->GetActiveWeapon() )
 	{
-		pPlayer->GetActiveWeapon()->AddEffects( EF_NODRAW );
+		pPlayer->SetViewEntity( this );
+
+		// Hide the player's viewmodel
+		if ( pPlayer->GetActiveWeapon() )
+		{
+			pPlayer->GetActiveWeapon()->AddEffects( EF_NODRAW );
+		}
 	}
 
 	// Only track if we have a target
@@ -3548,11 +3550,16 @@ void CTriggerCamera::Disable( void )
 				pBasePlayer->RemoveSolidFlags( FSOLID_NOT_SOLID );
 			}
 
-			if (!m_bDontSetPlayerView)
-				pBasePlayer->SetViewEntity( NULL );
+			if ( HasSpawnFlags( SF_CAMERA_PLAYER_TAKECONTROL ) )
+			{
+				pBasePlayer->EnableControl( TRUE );
+			}
 
-			pBasePlayer->EnableControl(TRUE);
-			pBasePlayer->m_Local.m_bDrawViewmodel = true;
+			if (!m_bDontSetPlayerView)
+			{
+				pBasePlayer->SetViewEntity( NULL );
+				pBasePlayer->m_Local.m_bDrawViewmodel = true;
+			}
 		}
 
 		if ( HasSpawnFlags( SF_CAMERA_PLAYER_SETFOV ) )