Merge pull request #213 from Toodles2You/rpg

Fix RPG being flagged as unusable while a rocket is loaded
twhl-community · Aug 18, 2023 · 183de9b · 183de9b
2 parents 0285a6e + e3899cc
commit 183de9b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git 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
@@ -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?