Fix metrocops using the wrong animation when pushing player with a gun

Blixibon · Blixibon · commit bbd8d86f87b7 · 2022-11-22T17:14:57.000-06:00
diff --git a/sp/src/game/server/hl2/npc_metropolice.cpp b/sp/src/game/server/hl2/npc_metropolice.cpp
@@ -3548,7 +3548,11 @@ Activity CNPC_MetroPolice::NPC_TranslateActivity( Activity newActivity )
 	// If we're shoving, see if we should be more forceful in doing so
 	if ( newActivity == ACT_PUSH_PLAYER )
 	{
+#ifdef MAPBASE
+		if ( m_nNumWarnings >= METROPOLICE_MAX_WARNINGS && Weapon_TranslateActivity( ACT_MELEE_ATTACK1, NULL ) == ACT_MELEE_ATTACK_SWING )
+#else
 		if ( m_nNumWarnings >= METROPOLICE_MAX_WARNINGS )
+#endif
 			return ACT_MELEE_ATTACK1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3548,7 +3548,11 @@ Activity CNPC_MetroPolice::NPC_TranslateActivity( Activity newActivity )`
`3548`	`3548`	`// If we're shoving, see if we should be more forceful in doing so`
`3549`	`3549`	`if ( newActivity == ACT_PUSH_PLAYER )`
`3550`	`3550`	`{`
	`3551`	`+#ifdef MAPBASE`
	`3552`	`+ if ( m_nNumWarnings >= METROPOLICE_MAX_WARNINGS && Weapon_TranslateActivity( ACT_MELEE_ATTACK1, NULL ) == ACT_MELEE_ATTACK_SWING )`
	`3553`	`+#else`
`3551`	`3554`	`if ( m_nNumWarnings >= METROPOLICE_MAX_WARNINGS )`
	`3555`	`+#endif`
`3552`	`3556`	`return ACT_MELEE_ATTACK1;`
`3553`	`3557`	`}`
`3554`	`3558`