diff --git a/regamedll/dlls/wpn_shared/wpn_aug.cpp b/regamedll/dlls/wpn_shared/wpn_aug.cpp index c54780f3..988c7480 100644 --- a/regamedll/dlls/wpn_shared/wpn_aug.cpp +++ b/regamedll/dlls/wpn_shared/wpn_aug.cpp @@ -78,21 +78,19 @@ void CAUG::SecondaryAttack() void CAUG::PrimaryAttack() { + const float flCycleTime = (m_pPlayer->pev->fov == DEFAULT_FOV) ? 0.0825f : 0.135f; + if (!(m_pPlayer->pev->flags & FL_ONGROUND)) { - AUGFire(0.035 + (0.4 * m_flAccuracy), 0.0825, FALSE); + AUGFire(0.035 + (0.4 * m_flAccuracy), flCycleTime, FALSE); } else if (m_pPlayer->pev->velocity.Length2D() > 140) { - AUGFire(0.035 + (0.07 * m_flAccuracy), 0.0825, FALSE); - } - else if (m_pPlayer->pev->fov == DEFAULT_FOV) - { - AUGFire(0.02 * m_flAccuracy, 0.0825, FALSE); + AUGFire(0.035 + (0.07 * m_flAccuracy), flCycleTime, FALSE); } else { - AUGFire(0.02 * m_flAccuracy, 0.135, FALSE); + AUGFire(0.02 * m_flAccuracy, flCycleTime, FALSE); } } diff --git a/regamedll/dlls/wpn_shared/wpn_sg552.cpp b/regamedll/dlls/wpn_shared/wpn_sg552.cpp index c95a6687..e86eec41 100644 --- a/regamedll/dlls/wpn_shared/wpn_sg552.cpp +++ b/regamedll/dlls/wpn_shared/wpn_sg552.cpp @@ -77,21 +77,19 @@ void CSG552::SecondaryAttack() void CSG552::PrimaryAttack() { + const float flCycleTime = (m_pPlayer->pev->fov == DEFAULT_FOV) ? 0.0825f : 0.135f; + if (!(m_pPlayer->pev->flags & FL_ONGROUND)) { - SG552Fire(0.035 + (0.45 * m_flAccuracy), 0.0825, FALSE); + SG552Fire(0.035 + (0.45 * m_flAccuracy), flCycleTime, FALSE); } else if (m_pPlayer->pev->velocity.Length2D() > 140) { - SG552Fire(0.035 + (0.075 * m_flAccuracy), 0.0825, FALSE); - } - else if (m_pPlayer->pev->fov == DEFAULT_FOV) - { - SG552Fire(0.02 * m_flAccuracy, 0.0825, FALSE); + SG552Fire(0.035 + (0.075 * m_flAccuracy), flCycleTime, FALSE); } else { - SG552Fire(0.02 * m_flAccuracy, 0.135, FALSE); + SG552Fire(0.02 * m_flAccuracy, flCycleTime, FALSE); } }