From 80251f67ec6a55e45ce418dd5294bf36cbdfd366 Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Sat, 18 Sep 2021 18:31:29 -0500
Subject: [PATCH] Fixed metrocops not speaking standoff sentences correctly

---
 sp/src/game/server/ai_behavior_standoff.cpp | 18 ++++++++++++++++++
 sp/src/game/server/hl2/npc_metropolice.cpp  |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sp/src/game/server/ai_behavior_standoff.cpp b/sp/src/game/server/ai_behavior_standoff.cpp
index 0792df23..bc5244ef 100644
--- a/sp/src/game/server/ai_behavior_standoff.cpp
+++ b/sp/src/game/server/ai_behavior_standoff.cpp
@@ -240,6 +240,23 @@ void CAI_StandoffBehavior::SetActive( bool fActive )
 {
 	if ( fActive !=	m_fActive )
 	{
+#ifdef MAPBASE
+		// These sentences are only spoken if the standoff behavior is active, so they have to be arranged separately
+		if ( fActive )
+		{
+			m_fActive = fActive;
+			NotifyChangeBehaviorStatus();
+
+			GetOuter()->SpeakSentence( STANDOFF_SENTENCE_BEGIN_STANDOFF );
+		}
+		else
+		{
+			GetOuter()->SpeakSentence( STANDOFF_SENTENCE_END_STANDOFF );
+
+			m_fActive = fActive;
+			NotifyChangeBehaviorStatus();
+		}
+#else
 		if ( fActive )
 		{
 			GetOuter()->SpeakSentence( STANDOFF_SENTENCE_BEGIN_STANDOFF );
@@ -251,6 +268,7 @@ void CAI_StandoffBehavior::SetActive( bool fActive )
 
 		m_fActive = fActive;
 		NotifyChangeBehaviorStatus();
+#endif
 	}
 }
 
diff --git a/sp/src/game/server/hl2/npc_metropolice.cpp b/sp/src/game/server/hl2/npc_metropolice.cpp
index bf56dc78..8f708b6e 100644
--- a/sp/src/game/server/hl2/npc_metropolice.cpp
+++ b/sp/src/game/server/hl2/npc_metropolice.cpp
@@ -882,7 +882,7 @@ void CNPC_MetroPolice::SpeakStandoffSentence( int nSentenceType )
 		break;
 
 	case STANDOFF_SENTENCE_FORCED_TAKE_COVER:
-		SpeakIfAllowed( TLK_COP_SO_END );
+		SpeakIfAllowed( TLK_COP_SO_FORCE_COVER );
 		break;
 
 	case STANDOFF_SENTENCE_STAND_CHECK_TARGET:
@@ -1008,7 +1008,12 @@ void CNPC_MetroPolice::SpeakSentence( int nSentenceType )
 			return;
 		}
 
+#ifdef MAPBASE
+		// Fixed issues with standoff sentences not playing when they should
+		if ( m_StandoffBehavior.IsActive() )
+#else
 		if ( GetRunningBehavior() == &m_StandoffBehavior )
+#endif
 		{
 			SpeakStandoffSentence( nSentenceType );
 			return;