|
|
@ -303,7 +303,7 @@ 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; |
|
|
|
|
|
|
|
|
|
|
|
// -----------------------------------------
|
|
|
|
// -----------------------------------------
|
|
|
@ -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); |
|
|
|
} |
|
|
|
} |
|
|
|