From e3899ccccc77dc4fb46af365c114c2340c3902e2 Mon Sep 17 00:00:00 2001 From: Justin <95296300+Toodles2You@users.noreply.github.com> Date: Thu, 17 Aug 2023 10:52:59 -0700 Subject: [PATCH] Fix RPG being flagged as unusable while a rocket is loaded --- dlls/rpg.cpp | 11 ----------- dlls/weapons.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp index adebc5069..15a179c1f 100644 --- a/dlls/rpg.cpp +++ b/dlls/rpg.cpp @@ -547,17 +547,6 @@ void CRpg::UpdateSpot() #endif } -bool CRpg::IsUseable() -{ - // The client needs to fall through to WeaponIdle so check the ammo here. - if (m_pPlayer->ammo_rockets <= 0) - { - return false; - } - - return CBasePlayerWeapon::IsUseable(); -} - class CRpgAmmo : public CBasePlayerAmmo { void Spawn() override diff --git a/dlls/weapons.h b/dlls/weapons.h index 417dc8347..6f18c7ff6 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -799,8 +799,6 @@ class CRpg : public CBasePlayerWeapon void UpdateSpot(); bool ShouldWeaponIdle() override { return true; } - bool IsUseable() override; - CLaserSpot* m_pSpot; bool m_fSpotActive; int m_cActiveRockets; // how many missiles in flight from this launcher right now?