From 0adf97e2debf4d7c06a916997021236971651184 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 31 Jul 2024 00:43:02 -0700 Subject: [PATCH] NSWeapon: reloadTime also needs to affect shotgun reloads. --- src/shared/NSWeapon.qc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/shared/NSWeapon.qc b/src/shared/NSWeapon.qc index c2c210ce..f6b99313 100644 --- a/src/shared/NSWeapon.qc +++ b/src/shared/NSWeapon.qc @@ -1211,6 +1211,7 @@ NSWeapon::Release(void) #endif break; case WEAPONSTATE_RELOAD: + float reloadTime; idleAnim = GetDefAct("actReload"); m_iClip++; ourOwner.UseAmmo(m_primaryAmmoType, 1); @@ -1222,6 +1223,16 @@ NSWeapon::Release(void) #ifdef SERVER Sound_Play(ourOwner, CHAN_WEAPON, GetDefString("snd_reload")); #endif + + if (m_flReloadSpeed == -1.0f) { + reloadTime = frameduration(m_viewModel, idleAnim); + } else { + reloadTime = m_flReloadSpeed; + } + + SetWeaponFrame(idleAnim); + SetIdleNext(reloadTime); + return; break; case WEAPONSTATE_RELOAD_END: idleAnim = GetDefAct("actReloadEnd");