mirror of
https://github.com/nillerusr/source-engine.git
synced 2025-01-12 08:08:06 +00:00
game: fix hl2mp slam (ValveSoftware/source-sdk-2013#532)
This commit is contained in:
parent
68483bd0f6
commit
047b3e3150
@ -303,7 +303,7 @@ 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;
|
||||
|
||||
// -----------------------------------------
|
||||
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user