Change return type of GetWeaponptr to CBasePlayerWeapon*

#157
twhl-community · Jul 22, 2022 · 5d8dc69 · 5d8dc69
1 parent 100aa3e
commit 5d8dc69
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/dlls/client.cpp b/dlls/client.cpp
@@ -1607,7 +1607,7 @@ int GetWeaponData(struct edict_s* player, struct weapon_data_s* info)
 
 			while (pPlayerItem)
 			{
-				gun = dynamic_cast<CBasePlayerWeapon*>(pPlayerItem->GetWeaponPtr());
+				gun = pPlayerItem->GetWeaponPtr();
 				if (gun && gun->UseDecrement())
 				{
 					// Get The ID.
@@ -1737,8 +1737,7 @@ void UpdateClientData(const edict_t* ent, int sendweapons, struct clientdata_s*
 
 			if (pl->m_pActiveItem)
 			{
-				CBasePlayerWeapon* gun;
-				gun = (CBasePlayerWeapon*)pl->m_pActiveItem->GetWeaponPtr();
+				CBasePlayerWeapon* gun = pl->m_pActiveItem->GetWeaponPtr();
 				if (gun && gun->UseDecrement())
 				{
 					ItemInfo II;

diff --git a/dlls/player.cpp b/dlls/player.cpp
@@ -2595,9 +2595,7 @@ void CBasePlayer::PostThink()
 
 			while (pPlayerItem)
 			{
-				CBasePlayerWeapon* gun;
-
-				gun = (CBasePlayerWeapon*)pPlayerItem->GetWeaponPtr();
+				CBasePlayerWeapon* gun = pPlayerItem->GetWeaponPtr();
 
 				if (gun && gun->UseDecrement())
 				{

diff --git a/dlls/weapons.h b/dlls/weapons.h
@@ -19,6 +19,7 @@
 #include "weaponinfo.h"
 
 class CBasePlayer;
+class CBasePlayerWeapon;
 
 void DeactivateSatchels(CBasePlayer* pOwner);
 
@@ -248,7 +249,7 @@ class CBasePlayerItem : public CBaseAnimating
 
 	virtual bool UpdateClientData(CBasePlayer* pPlayer) { return false; }
 
-	virtual CBasePlayerItem* GetWeaponPtr() { return NULL; }
+	virtual CBasePlayerWeapon* GetWeaponPtr() { return NULL; }
 
 	virtual void GetWeaponData(weapon_data_t& data) {}
 
@@ -338,7 +339,7 @@ class CBasePlayerWeapon : public CBasePlayerItem
 
 	void PrintState();
 
-	CBasePlayerItem* GetWeaponPtr() override { return (CBasePlayerItem*)this; }
+	CBasePlayerWeapon* GetWeaponPtr() override { return this; }
 	float GetNextAttackDelay(float delay);
 
 	float m_flPumpTime;

diff --git a/dlls/weapons_shared.cpp b/dlls/weapons_shared.cpp
@@ -224,7 +224,7 @@ void CBasePlayer::SelectLastItem()
 	m_pActiveItem = m_pLastItem;
 	m_pLastItem = pTemp;
 
-	auto weapon = static_cast<CBasePlayerWeapon*>(m_pActiveItem->GetWeaponPtr());
+	auto weapon = m_pActiveItem->GetWeaponPtr();
 
 	if (weapon)
 	{