vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

NSWeapon: add 'reloadTime' key override

Browse source
This commit is contained in:
Marco Cawthorne 2024-07-31 00:07:55 -07:00
parent 7c68a0317e
commit 792c764c2e
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/shared/NSWeapon.h
View file

@ -229,6 +229,7 @@ private:
bool m_fiWillRelease; bool m_fiWillRelease;
bool m_fiSemiAuto; bool m_fiSemiAuto;
string m_fiSndFireLoop; string m_fiSndFireLoop;
float m_flReloadSpeed;
NETWORKED_INT(m_iClip) NETWORKED_INT(m_iClip)
NETWORKED_INT(m_iClipSize) NETWORKED_INT(m_iClipSize)

15
src/shared/NSWeapon.qc
View file

@ -41,6 +41,7 @@ NSWeapon::NSWeapon(void)
m_dState = 0; m_dState = 0;
m_strLastFireInfo = __NULL__; m_strLastFireInfo = __NULL__;
m_flSpeedMod = 1.0f; m_flSpeedMod = 1.0f;
m_flReloadSpeed = -1.0f;
} }
void void
@ -67,6 +68,7 @@ void
NSWeapon::UpdateFireInfoCache(void) NSWeapon::UpdateFireInfoCache(void)
{ {
string ammoPerShot = GetSubDefString(m_strLastFireInfo, "ammoPerShot"); string ammoPerShot = GetSubDefString(m_strLastFireInfo, "ammoPerShot");
string reloadSpeed = GetSubDefString(m_strLastFireInfo, "reloadTime");
m_fiDetonateOnFire = GetSubDefString(m_strLastFireInfo, "detonateOnFire"); m_fiDetonateOnFire = GetSubDefString(m_strLastFireInfo, "detonateOnFire");
m_fiMeleeRange = GetSubDefFloat(m_strLastFireInfo, "melee_distance"); m_fiMeleeRange = GetSubDefFloat(m_strLastFireInfo, "melee_distance");
m_fiPunchAngle = GetSubDefVector(m_strLastFireInfo, "punchAngle"); m_fiPunchAngle = GetSubDefVector(m_strLastFireInfo, "punchAngle");
@ -79,11 +81,18 @@ NSWeapon::UpdateFireInfoCache(void)
m_fiOnRelease = GetSubDefString(m_strLastFireInfo, "def_onRelease"); m_fiOnRelease = GetSubDefString(m_strLastFireInfo, "def_onRelease");
m_fiSemiAuto = GetSubDefBool(m_strLastFireInfo, "semiAuto"); m_fiSemiAuto = GetSubDefBool(m_strLastFireInfo, "semiAuto");
if (reloadSpeed != "") {
m_flReloadSpeed = stof(reloadSpeed);
} else {
m_flReloadSpeed = -1.0f;
}
#if 0 #if 0
NSError("Switched FireInfo to %S", m_strLastFireInfo); NSError("Switched FireInfo to %S", m_strLastFireInfo);
NSError("m_fiAmmoType: %i", m_fiAmmoRequired); NSError("m_fiAmmoType: %i", m_fiAmmoRequired);
NSError("m_fiAmmoRequired: %d", m_fiAmmoRequired); NSError("m_fiAmmoRequired: %d", m_fiAmmoRequired);
NSError("m_fiFireRate: %f", m_fiAmmoRequired); NSError("m_fiFireRate: %f", m_fiAmmoRequired);
NSError("m_flReloadSpeed: %f", m_flReloadSpeed);
#endif #endif
/* validate */ /* validate */
@ -1046,7 +1055,11 @@ NSWeapon::Reload(void)
} }
} }
reloadTime = frameduration(m_viewModel, reloadAnimation); if (m_flReloadSpeed == -1.0f) {
reloadTime = frameduration(m_viewModel, reloadAnimation);
} else {
reloadTime = m_flReloadSpeed;
}
#ifdef SERVER #ifdef SERVER
string soundDef = GetDefString("snd_reload"); string soundDef = GetDefString("snd_reload");