From 0faa6d9b1aa690977b7d0ce57b741b5ef2ff0cc3 Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Sat, 31 Jul 2021 14:47:10 -0500
Subject: [PATCH] Added a way for commentary node progress bars and subtitles
 to appear at the same time

---
 .../game/client/c_point_commentary_node.cpp   | 90 +++++++++++++++++++
 sp/src/game/client/hud_closecaption.h         |  9 ++
 2 files changed, 99 insertions(+)

diff --git a/sp/src/game/client/c_point_commentary_node.cpp b/sp/src/game/client/c_point_commentary_node.cpp
index f9e447c6..fa5f8eac 100644
--- a/sp/src/game/client/c_point_commentary_node.cpp
+++ b/sp/src/game/client/c_point_commentary_node.cpp
@@ -49,6 +49,8 @@ static bool g_bTracingVsCommentaryNodes = false;
 ConVar commentary_type_force( "commentary_type_force", "-1", FCVAR_NONE, "Forces all commentary nodes to use the specified type." );
 ConVar commentary_type_text_endtime( "commentary_type_text_endtime", "120" );
 ConVar commentary_type_image_endtime( "commentary_type_image_endtime", "120" );
+ConVar commentary_audio_element_below_cc( "commentary_audio_element_below_cc", "1", FCVAR_NONE, "Allows commentary audio elements to display even when CC is enabled (although this is done by inverting their Y axis)" );
+ConVar commentary_audio_element_below_cc_margin( "commentary_audio_element_below_cc_margin", "4" );
 #endif
 
 //-----------------------------------------------------------------------------
@@ -828,6 +830,18 @@ void CHudCommentary::Paint()
 			if ( pHudCloseCaption )
 			{
 				pHudCloseCaption->Reset();
+
+#ifdef MAPBASE
+				// Reset close caption element if needed
+				if (pHudCloseCaption->IsUsingCommentaryDimensions())
+				{
+					int ccX, ccY;
+					pHudCloseCaption->GetPos( ccX, ccY );
+					pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
+
+					pHudCloseCaption->SetUsingCommentaryDimensions( false );
+				}
+#endif
 			}
 		}
 	}
@@ -840,6 +854,17 @@ void CHudCommentary::Paint()
 			// Ensure that the scene is terminated
 			if (m_iCommentaryType == COMMENTARY_TYPE_SCENE)
 				m_hActiveNode->StopLoopingSounds();
+
+			// Reset close caption element if needed
+			CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
+			if (pHudCloseCaption && pHudCloseCaption->IsUsingCommentaryDimensions())
+			{
+				int ccX, ccY;
+				pHudCloseCaption->GetPos( ccX, ccY );
+				pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
+
+				pHudCloseCaption->SetUsingCommentaryDimensions( false );
+			}
 #endif
 
 			m_hActiveNode = NULL;
@@ -1155,6 +1180,33 @@ void CHudCommentary::StartCommentary( C_PointCommentaryNode *pNode, char *pszSpe
 	{
 		m_bShouldPaint = true;
 	}
+
+#ifdef MAPBASE
+	if (!m_bShouldPaint && commentary_audio_element_below_cc.GetBool())
+	{
+		m_bShouldPaint = true;
+
+		// Invert the Y axis
+		//SetPos( m_iTypeAudioX, ScreenHeight() - m_iTypeAudioY );
+
+		// Place underneath the close caption element
+		CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
+		if (pHudCloseCaption)
+		{
+			int ccX, ccY;
+			pHudCloseCaption->GetPos( ccX, ccY );
+			ccY -= m_iTypeAudioT;
+
+			pHudCloseCaption->SetPos( ccX, ccY - commentary_audio_element_below_cc_margin.GetInt() );
+
+			SetPos( ccX, ccY + pHudCloseCaption->GetTall() );
+			SetWide( pHudCloseCaption->GetWide() );
+
+			pHudCloseCaption->SetUsingCommentaryDimensions( true );
+		}
+	}
+#endif
+
 	SetPaintBackgroundEnabled( m_bShouldPaint );
 
 	char sz[MAX_COUNT_STRING];
@@ -1332,6 +1384,31 @@ void CHudCommentary::StartSceneCommentary( C_PointCommentaryNode *pNode, char *p
 	{
 		m_bShouldPaint = true;
 	}
+
+	if (!m_bShouldPaint && commentary_audio_element_below_cc.GetBool())
+	{
+		m_bShouldPaint = true;
+
+		// Invert the Y axis
+		//SetPos( m_iTypeAudioX, ScreenHeight() - m_iTypeAudioY );
+
+		// Place underneath the close caption element
+		CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
+		if (pHudCloseCaption)
+		{
+			int ccX, ccY;
+			pHudCloseCaption->GetPos( ccX, ccY );
+			ccY -= m_iTypeAudioT;
+
+			pHudCloseCaption->SetPos( ccX, ccY - commentary_audio_element_below_cc_margin.GetInt() );
+
+			SetPos( ccX, ccY + pHudCloseCaption->GetTall() );
+			SetWide( pHudCloseCaption->GetWide() );
+
+			pHudCloseCaption->SetUsingCommentaryDimensions( true );
+		}
+	}
+
 	SetPaintBackgroundEnabled( m_bShouldPaint );
 
 	char sz[MAX_COUNT_STRING];
@@ -1357,6 +1434,19 @@ void CHudCommentary::StartSceneCommentary( C_PointCommentaryNode *pNode, char *p
 void CHudCommentary::StopCommentary( void )
 {
 	m_hActiveNode = NULL;
+
+#ifdef MAPBASE
+	// Reset close caption element if needed
+	CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
+	if (pHudCloseCaption && pHudCloseCaption->IsUsingCommentaryDimensions())
+	{
+		int ccX, ccY;
+		pHudCloseCaption->GetPos( ccX, ccY );
+		pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
+
+		pHudCloseCaption->SetUsingCommentaryDimensions( false );
+	}
+#endif
 }
 
 //-----------------------------------------------------------------------------
diff --git a/sp/src/game/client/hud_closecaption.h b/sp/src/game/client/hud_closecaption.h
index f89dffb3..b3bdae06 100644
--- a/sp/src/game/client/hud_closecaption.h
+++ b/sp/src/game/client/hud_closecaption.h
@@ -138,6 +138,11 @@ public:
 
 	void			FindSound( char const *pchANSI );
 
+#ifdef MAPBASE
+	inline bool		IsUsingCommentaryDimensions() const { return m_bUsingCommentaryDimensions; }
+	inline void		SetUsingCommentaryDimensions( bool bToggle ) { m_bUsingCommentaryDimensions = bToggle; }
+#endif
+
 public:
 
 	struct CaptionRepeat
@@ -217,6 +222,10 @@ private:
 	bool		m_bVisibleDueToDirect;
 	bool		m_bPaintDebugInfo;
 	CUtlSymbol	m_CurrentLanguage;
+
+#ifdef MAPBASE
+	bool		m_bUsingCommentaryDimensions;
+#endif
 };
 
 #endif // HUD_CLOSECAPTION_H