From 450e6a2ff2ea95429b79f96b55308a0ee2b7f5eb Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Mon, 15 Nov 2021 16:21:52 -0600
Subject: [PATCH] Implemented crossbow worldmodel bolt disappearance on player
 reload

---
 sp/src/game/server/hl2/weapon_crossbow.cpp | 40 ++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/sp/src/game/server/hl2/weapon_crossbow.cpp b/sp/src/game/server/hl2/weapon_crossbow.cpp
index 7766ff98..71df75f3 100644
--- a/sp/src/game/server/hl2/weapon_crossbow.cpp
+++ b/sp/src/game/server/hl2/weapon_crossbow.cpp
@@ -591,6 +591,7 @@ private:
 	void	CheckZoomToggle( void );
 	void	FireBolt( void );
 #ifdef MAPBASE
+	void	SetBolt( int iSetting );
 	void	FireNPCBolt( CAI_BaseNPC *pOwner, Vector &vecShootOrigin, Vector &vecShootDir );
 #endif
 	void	ToggleZoom( void );
@@ -861,11 +862,7 @@ void CWeaponCrossbow::Reload_NPC( bool bPlaySound )
 {
 	BaseClass::Reload_NPC( bPlaySound );
 
-	int iBody = FindBodygroupByName( "bolt" );
-	if (iBody != -1)
-		SetBodygroup( iBody, 0 );
-	else
-		m_nSkin = 0;
+	SetBolt( 0 );
 }
 #endif
 
@@ -970,6 +967,10 @@ void CWeaponCrossbow::FireBolt( void )
 
 	m_iClip1--;
 
+#ifdef MAPBASE
+	SetBolt( 1 );
+#endif
+
 	pOwner->ViewPunch( QAngle( -2, 0, 0 ) );
 
 	WeaponSound( SINGLE );
@@ -992,6 +993,18 @@ void CWeaponCrossbow::FireBolt( void )
 }
 
 #ifdef MAPBASE
+//-----------------------------------------------------------------------------
+// Purpose: Sets whether or not the bolt is visible
+//-----------------------------------------------------------------------------
+inline void CWeaponCrossbow::SetBolt( int iSetting )
+{
+	int iBody = FindBodygroupByName( "bolt" );
+	if (iBody != -1 || (GetOwner() && GetOwner()->IsPlayer())) // HACKHACK: Player models check the viewmodel instead of the worldmodel, so we have to do this manually
+		SetBodygroup( iBody, iSetting );
+	else
+		m_nSkin = iSetting;
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
@@ -1015,11 +1028,7 @@ void CWeaponCrossbow::FireNPCBolt( CAI_BaseNPC *pOwner, Vector &vecShootOrigin,
 
 	m_iClip1--;
 
-	int iBody = FindBodygroupByName( "bolt" );
-	if (iBody != -1)
-		SetBodygroup( iBody, 1 );
-	else
-		m_nSkin = 1;
+	SetBolt( 1 );
 
 	WeaponSound( SINGLE_NPC );
 	WeaponSound( SPECIAL2 );
@@ -1041,11 +1050,18 @@ bool CWeaponCrossbow::Deploy( void )
 {
 	if ( m_iClip1 <= 0 )
 	{
+#ifdef MAPBASE
+		SetBolt( 1 );
+#endif
 		return DefaultDeploy( (char*)GetViewModel(), (char*)GetWorldModel(), ACT_CROSSBOW_DRAW_UNLOADED, (char*)GetAnimPrefix() );
 	}
 
 	SetSkin( BOLT_SKIN_GLOW );
 
+#ifdef MAPBASE
+	SetBolt( 0 );
+#endif
+
 	return BaseClass::Deploy();
 }
 
@@ -1193,6 +1209,10 @@ void CWeaponCrossbow::SetChargerState( ChargerState_t state )
 		// Shoot some sparks and draw a beam between the two outer points
 		DoLoadEffect();
 		
+#ifdef MAPBASE
+		SetBolt( 0 );
+#endif
+		
 		break;
 
 	case CHARGER_STATE_START_CHARGE: