From 7702ce96d40b195e8a6e57bd916cbb632f423c9b Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Tue, 28 Sep 2021 12:10:25 -0500
Subject: [PATCH] Fixed reloading for certain weapons on certain NPCs

---
 .../game/shared/basecombatweapon_shared.cpp   | 21 +++++++++++++++++++
 sp/src/game/shared/basecombatweapon_shared.h  |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sp/src/game/shared/basecombatweapon_shared.cpp b/sp/src/game/shared/basecombatweapon_shared.cpp
index 9f3b9be4..a48aa413 100644
--- a/sp/src/game/shared/basecombatweapon_shared.cpp
+++ b/sp/src/game/shared/basecombatweapon_shared.cpp
@@ -2339,6 +2339,27 @@ bool CBaseCombatWeapon::Reload( void )
 	return DefaultReload( GetMaxClip1(), GetMaxClip2(), ACT_VM_RELOAD );
 }
 
+#ifdef MAPBASE
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void CBaseCombatWeapon::Reload_NPC( void )
+{
+	WeaponSound( RELOAD_NPC );
+
+	if (UsesClipsForAmmo1())
+	{
+		m_iClip1 = GetMaxClip1();
+	}
+	else
+	{
+		// For weapons which don't use clips, give the owner ammo.
+		if (GetOwner())
+			GetOwner()->SetAmmoCount( GetDefaultClip1(), m_iPrimaryAmmoType );
+	}
+}
+#endif
+
 //=========================================================
 void CBaseCombatWeapon::WeaponIdle( void )
 {
diff --git a/sp/src/game/shared/basecombatweapon_shared.h b/sp/src/game/shared/basecombatweapon_shared.h
index 2d19727d..b0a3e330 100644
--- a/sp/src/game/shared/basecombatweapon_shared.h
+++ b/sp/src/game/shared/basecombatweapon_shared.h
@@ -319,7 +319,7 @@ public:
 	bool					ReloadsSingly( void ) const;
 #ifdef MAPBASE
 	// Originally created for the crossbow, can be used to add special NPC reloading behavior
-	virtual void			Reload_NPC( void ) { WeaponSound(RELOAD_NPC); m_iClip1 = GetMaxClip1(); }
+	virtual void			Reload_NPC( void );
 #endif
 
 	virtual bool			AutoFiresFullClip( void ) { return false; }