From ce93ef1d2dfcda36127456996197bb3d95a3576e Mon Sep 17 00:00:00 2001 From: cypress Date: Fri, 15 Sep 2023 10:13:42 -0400 Subject: [PATCH] FTE/SERVER: Fix reloading while scoped with Sniper Rifles --- source/server/weapons/weapon_core.qc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc index 8c8368b..00e2c41 100644 --- a/source/server/weapons/weapon_core.qc +++ b/source/server/weapons/weapon_core.qc @@ -410,6 +410,9 @@ void(float side) W_AdvanceAnim = void(float side) W_Reload = { + if (self.zoom == 2) + return; + if (self.weapon == W_M2 || self.weapon == W_FIW) return; @@ -2117,6 +2120,9 @@ void () Weapon_Logic = UpdateVmodel(self.weaponmodel, GetWepSkin(self.weapon)); UpdateV2model(self.weapon2model, 0); self.viewzoom = 1; + self.zoom = 0; + if (self.currentmag == 0) + W_Reload(S_BOTH); } else { if (self.viewzoom == 0.75) { W_AimOut();