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

ncWeapon: unstick viewzoom

Browse source
This commit is contained in:
Marco Cawthorne 2025-02-07 22:40:00 -08:00
parent 0d86ba22e9
commit 71dc508bad
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/Weapon.h
View file

@ -283,6 +283,8 @@ private:
nonvirtual ncWeapon GetPreviousWeapon(void);
/** Plays the weapon empty sound. */
nonvirtual void EmptySound(void);
/** Sets the viewzoom on its owner. */
nonvirtual void SetViewZoom(float);
#ifdef CLIENT
virtual void HandleAnimEvent(float, int, string);

27
src/shared/Weapon.qc
View file

@ -147,6 +147,7 @@ ncWeapon::UpdateFireInfoCache(void)
m_fiAmmoRequired = GetSubDefBool(m_strLastFireInfo, "ammoRequired");
m_fiFireRate = GetSubDefFloat(m_strLastFireInfo, "fireRate");
m_fiSemiAuto = GetSubDefBool(m_strLastFireInfo, "semiAuto");
m_flZoomFOV = GetSubDefFloat(m_strLastFireInfo, "zoomFov") / 90.0f;
/* defs to spawn */
m_fiOnFire = GetSubDefString(m_strLastFireInfo, "def_onFire");
@ -226,15 +227,6 @@ ncWeapon::UpdateFireInfoCache(void)
NSError("m_flReloadSpeed: %f", m_flReloadSpeed);
#endif
ncPlayer ourOwner = (ncPlayer)GetOwner();
float zoomFov = GetSubDefFloat(m_strLastFireInfo, "zoomFov");
if (zoomFov > 0) {
ourOwner.viewzoom = zoomFov / cvar("fov");
} else {
ourOwner.viewzoom = 1.0f;
}
/* validate */
if (ammoPerShot != __NULL__) {
m_fiAmmoPerShot = (int)stoi(ammoPerShot);
@ -271,6 +263,17 @@ ncWeapon::UpdateFireInfoCache(void)
#endif
}
void
ncWeapon::SetViewZoom(float viewZoom)
{
if (viewZoom == 0.0) {
viewZoom = 1.0f;
}
ncPlayer ourOwner = (ncPlayer)GetOwner();
ourOwner.viewzoom = viewZoom;
}
void
ncWeapon::SwitchFireInfo(string newInfo)
{
@ -775,7 +778,6 @@ ncWeapon::_CacheWeaponDefVariables(void)
m_bAmmoRequired = stof(ammoRequired);
m_primaryAmmoType = ammoNumForName(firstType);
m_flPrimedFuse = GetDefFloat("primed_fuse");
m_flZoomFOV = GetDefFloat("zoomFov") / 90;
m_bPowerAmmo = GetDefBool("powerAmmo");
m_bRemoveOnEmpty = GetDefBool("removeOnEmpty");
m_fxTrail = particleeffectnum(GetDefString("fx_trail"));
@ -1480,15 +1482,16 @@ ncWeapon::SecondaryAttack(void)
if (CanFire() == false) {
return;
}
ourOwner = (ncPlayer)GetOwner();
ourOwner.viewzoom = (ourOwner.viewzoom == 1.0) ? m_flZoomFOV : 1.0;
#ifdef SERVER
if (ourOwner.viewzoom == 1.0) {
PlaySound(GetDefString("snd_lowerScope"), CHAN_AUTO, false);
SetViewZoom(m_flZoomFOV);
} else {
PlaySound(GetDefString("snd_raiseScope"), CHAN_AUTO, false);
SetViewZoom(1.0f);
}
#endif