Fix weapon deploy animations caused by lastinv command not working pr…

…operly Resolves #154
twhl-community · Jul 20, 2022 · 42f45bd · 42f45bd
1 parent 62525c6
commit 42f45bd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp
@@ -735,7 +735,7 @@ bool CBasePlayerWeapon::UpdateClientData(CBasePlayer* pPlayer)
 
 void CBasePlayerWeapon::SendWeaponAnim(int iAnim, int body)
 {
-	const bool skiplocal = UseDecrement() != false;
+	const bool skiplocal = !m_ForceSendAnimations && UseDecrement() != false;
 
 	m_pPlayer->pev->weaponanim = iAnim;
 

diff --git a/dlls/weapons.h b/dlls/weapons.h
@@ -358,6 +358,9 @@ class CBasePlayerWeapon : public CBasePlayerItem
 	// hle time creep vars
 	float m_flPrevPrimaryAttack;
 	float m_flLastFireTime;
+
+	//Hack so deploy animations work when weapon prediction is enabled.
+	bool m_ForceSendAnimations = false;
 };
 
 

diff --git a/dlls/weapons_shared.cpp b/dlls/weapons_shared.cpp
@@ -223,6 +223,20 @@ void CBasePlayer::SelectLastItem()
 	CBasePlayerItem* pTemp = m_pActiveItem;
 	m_pActiveItem = m_pLastItem;
 	m_pLastItem = pTemp;
+
+	auto weapon = static_cast<CBasePlayerWeapon*>(m_pActiveItem->GetWeaponPtr());
+
+	if (weapon)
+	{
+		weapon->m_ForceSendAnimations = true;
+	}
+
 	m_pActiveItem->Deploy();
+
+	if (weapon)
+	{
+		weapon->m_ForceSendAnimations = false;
+	}
+
 	m_pActiveItem->UpdateItemInfo();
 }