game: fix hl2mp slam (ValveSoftware/source-sdk-2013#532)

XutaxKamay · Aug 16, 2022 · 5d7bce9 · 5d7bce9
1 parent 0ac3a16
commit 5d7bce9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/game/shared/hl2mp/weapon_slam.cpp b/game/shared/hl2mp/weapon_slam.cpp
@@ -303,17 +303,17 @@ bool CWeapon_SLAM::AnyUndetonatedCharges(void)
 void CWeapon_SLAM::StartSatchelDetonate()
 {
 
-	if ( GetActivity() != ACT_SLAM_DETONATOR_IDLE && GetActivity() != ACT_SLAM_THROW_IDLE )
+	if ( GetActivity() != ACT_SLAM_DETONATOR_IDLE && GetActivity() != ACT_SLAM_THROW_IDLE && !m_bDetonatorArmed )
 		 return;
-	
+
 	// -----------------------------------------
 	//  Play detonate animation
 	// -----------------------------------------
 	if (m_bNeedReload)
 	{
 		SendWeaponAnim(ACT_SLAM_DETONATOR_DETONATE);
 	}
-	else if (m_tSlamState == SLAM_SATCHEL_ATTACH)
+	else if (m_tSlamState == SLAM_SATCHEL_ATTACH || m_tSlamState == SLAM_TRIPMINE_READY)
 	{
 		SendWeaponAnim(ACT_SLAM_STICKWALL_DETONATE);
 	}