d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-02-03 02:34:16 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SanyaSho 2022-08-16 15:43:17 +03:00
parent 68483bd0f6
commit 047b3e3150
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/shared/hl2mp/weapon_slam.cpp
View File

@ -303,9 +303,9 @@ bool CWeapon_SLAM::AnyUndetonatedCharges(void)
void CWeapon_SLAM::StartSatchelDetonate() 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; return;
// ----------------------------------------- // -----------------------------------------
// Play detonate animation // Play detonate animation
// ----------------------------------------- // -----------------------------------------
@ -313,7 +313,7 @@ void CWeapon_SLAM::StartSatchelDetonate()
{ {
SendWeaponAnim(ACT_SLAM_DETONATOR_DETONATE); 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); SendWeaponAnim(ACT_SLAM_STICKWALL_DETONATE);
} }