Prototype 'forced-to-spectate' player flag

infclass · Jan 5, 2022 · 1793597 · 1793597
1 parent 85266b8
commit 1793597
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/datasrc/network.py b/datasrc/network.py
@@ -34,7 +34,7 @@
 
 Emoticons = ["OOP", "EXCLAMATION", "HEARTS", "DROP", "DOTDOT", "MUSIC", "SORRY", "GHOST", "SUSHI", "SPLATTEE", "DEVILTEE", "ZOMG", "ZZZ", "WTF", "EYES", "QUESTION"]
 
-InfClassPlayerFlags = ["INFECTED", "HOOK_PROTECTION_OFF"]
+InfClassPlayerFlags = ["INFECTED", "HOOK_PROTECTION_OFF", "FORCED_TO_SPECTATE"]
 
 InfClassObjectFlags = ["HAS_SECOND_POSITION"]
 

diff --git a/src/game/client/components/camera.cpp b/src/game/client/components/camera.cpp
@@ -165,7 +165,8 @@ void CCamera::OnRender()
 		else
 			s_CurrentCameraOffset[g_Config.m_ClDummy] = TargetCameraOffset;
 
-		if(m_pClient->m_Snap.m_SpecInfo.m_Active)
+		bool InfSpecTarget = m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_aClients[m_pClient->m_Snap.m_pLocalInfo->m_ClientID].m_InfClassPlayerFlags & INFCLASS_PLAYER_FLAG_FORCED_TO_SPECTATE;
+		if(m_pClient->m_Snap.m_SpecInfo.m_Active || InfSpecTarget)
 			m_Center = m_pClient->m_Snap.m_SpecInfo.m_Position + s_CurrentCameraOffset[g_Config.m_ClDummy];
 		else
 			m_Center = m_pClient->m_LocalCharacterPos + s_CurrentCameraOffset[g_Config.m_ClDummy];

diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -548,7 +548,8 @@ void CGameClient::UpdatePositions()
 	}
 
 	// spectator position
-	if(m_Snap.m_SpecInfo.m_Active)
+	bool InfForcedToSpectate = m_Snap.m_pLocalInfo && m_aClients[m_Snap.m_pLocalInfo->m_ClientID].m_InfClassPlayerFlags & INFCLASS_PLAYER_FLAG_FORCED_TO_SPECTATE;
+	if(m_Snap.m_SpecInfo.m_Active || InfForcedToSpectate)
 	{
 		if(Client()->State() == IClient::STATE_DEMOPLAYBACK && m_DemoSpecID != SPEC_FOLLOW && m_Snap.m_SpecInfo.m_SpectatorID != SPEC_FREEVIEW)
 		{