From 5d7bce99378595ee3b596d93e5bf1ca0ee93e459 Mon Sep 17 00:00:00 2001 From: SanyaSho Date: Tue, 16 Aug 2022 15:43:17 +0300 Subject: [PATCH] game: fix hl2mp slam (ValveSoftware/source-sdk-2013#532) --- game/shared/hl2mp/weapon_slam.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game/shared/hl2mp/weapon_slam.cpp b/game/shared/hl2mp/weapon_slam.cpp index bcdec40cdd..9cbc25743a 100644 --- a/game/shared/hl2mp/weapon_slam.cpp +++ b/game/shared/hl2mp/weapon_slam.cpp @@ -303,9 +303,9 @@ 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 // ----------------------------------------- @@ -313,7 +313,7 @@ void CWeapon_SLAM::StartSatchelDetonate() { 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); }