From b055d776639083aa49ca8c71649bb35f153d6de8 Mon Sep 17 00:00:00 2001
From: "ALLEN-PC\\acj30" <acj3017@gmail.com>
Date: Thu, 9 Jan 2025 12:29:03 -0600
Subject: [PATCH] Move npc_metropolice enemy kill concept to
 Event_KilledOther()

---
 sp/src/game/server/hl2/npc_metropolice.cpp | 17 +++++++++++++++++
 sp/src/game/server/hl2/npc_metropolice.h   |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/sp/src/game/server/hl2/npc_metropolice.cpp b/sp/src/game/server/hl2/npc_metropolice.cpp
index 40f1d5be..f515ab92 100644
--- a/sp/src/game/server/hl2/npc_metropolice.cpp
+++ b/sp/src/game/server/hl2/npc_metropolice.cpp
@@ -534,10 +534,12 @@ void CNPC_MetroPolice::OnScheduleChange()
 {
 	BaseClass::OnScheduleChange();
 
+#ifndef MAPBASE // Moved to Event_KilledOther()
 	if ( GetEnemy() && HasCondition( COND_ENEMY_DEAD ) )
 	{
 		AnnounceEnemyKill( GetEnemy() );
 	}
+#endif
 }
 
 
@@ -3722,6 +3724,21 @@ void CNPC_MetroPolice::Event_Killed( const CTakeDamageInfo &info )
 	BaseClass::Event_Killed( info );
 }
 
+//-----------------------------------------------------------------------------
+// 
+//-----------------------------------------------------------------------------
+void CNPC_MetroPolice::Event_KilledOther( CBaseEntity *pVictim, const CTakeDamageInfo &info )
+{
+	BaseClass::Event_KilledOther( pVictim, info );
+
+#ifdef MAPBASE // Moved from OnScheduleChange()
+	if ( pVictim && (pVictim->IsPlayer() || pVictim->IsNPC()) )
+	{
+		AnnounceEnemyKill( pVictim );
+	}
+#endif
+}
+
 //-----------------------------------------------------------------------------
 // Try to enter a slot where we shoot a pistol 
 //-----------------------------------------------------------------------------
diff --git a/sp/src/game/server/hl2/npc_metropolice.h b/sp/src/game/server/hl2/npc_metropolice.h
index 1027786b..690bf2ae 100644
--- a/sp/src/game/server/hl2/npc_metropolice.h
+++ b/sp/src/game/server/hl2/npc_metropolice.h
@@ -79,6 +79,8 @@ public:
 
 	virtual void Event_Killed( const CTakeDamageInfo &info );
 
+	virtual void Event_KilledOther( CBaseEntity *pVictim, const CTakeDamageInfo &info );
+
 	virtual void OnScheduleChange();
 
 	float		GetIdealAccel( void ) const;