chore(core): Code Refactor

Author: skuzzis

plugin_files/gamedata/offsets.json

@@ -27,22 +27,14 @@
         "windows": 178,
         "linux": 177
     },
-    "CCSPlayer_ItemServices_GiveNamedItem": {
-        "windows": 17,
-        "linux": 19
-    },
-    "CCSPlayer_ItemServices_RemoveWeapons": {
-        "windows": 19,
-        "linux": 20
+    "CCSPlayer_WeaponServices_DropWeapon": {
+        "windows": 20,
+        "linux": 21
     },
     "CGameSceneNode_GetSkeletonInstance": {
         "windows": 8,
         "linux": 8
     },
-    "CEntityResourceManifest_AddResource": {
-        "windows": 2,
-        "linux": 2
-    },
     "SendNetMessage": {
         "windows": 15,
         "linux": 16

plugin_files/gamedata/signatures.json

@@ -94,11 +94,6 @@
         "windows": "48 89 5C 24 ? 56 48 83 EC 40 48 8B F2 48 8B D9 BA ? ? ? ? E8 ? ? ? ? 48 8B 4B 30",
         "linux": "55 48 89 E5 41 56 41 55 41 54 49 89 F4 BE ? ? ? ? 53 48 89 FB 48 83 EC 30 E8 ? ? ? ? 48 8B 7B 30"
     },
-    "CBaseEntity_EmitSoundParams": {
-        "lib": "server",
-        "windows": "48 8B C4 48 89 58 10 48 89 70 18 55 57 41 56 48 8D A8 08 FF FF FF",
-        "linux": "48 B8 2A 2A 2A 2A 2A 2A 2A 2A 55 48 89 E5 41 55 41 54 49 89 FC 53 48 89 F3"
-    },
     "CBaseEntity_EmitSoundFilter": {
         "lib": "server",
         "windows": "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 48 89 7C 24 20 41 56 48 83 EC 30 48 8B EA",

src/plugins/core/scripting/weapons.cpp

@@ -54,10 +54,7 @@ void PluginWeaponManager::RemoveWeapons()
         if (!weapon)
             continue;
 
-        weaponServices->m_hActiveWeapon = weaponHandle;
-        itemServices->DropPlayerWeapon(weapon);
         weaponServices->RemoveWeapon(weapon);
-        weapon->Despawn();
     }
 }
 void PluginWeaponManager::DropWeapons()
@@ -92,8 +89,7 @@ void PluginWeaponManager::DropWeapons()
         if (!weapon)
             continue;
 
-        weaponServices->m_hActiveWeapon = weaponHandle;
-        itemServices->DropPlayerWeapon(weapon);
+        weaponServices->DropWeapon(weapon);
     }
 }
 
@@ -177,15 +173,10 @@ void PluginWeapon::Drop()
     if (!weaponServices)
         return;
 
-    CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
-    if (!itemServices)
-        return;
-
     if (!this->m_ptr)
         return;
 
-    weaponServices->m_hActiveWeapon = this->m_ptr;
-    itemServices->DropPlayerWeapon(this->m_ptr);
+    weaponServices->DropWeapon(this->m_ptr);
 }
 void PluginWeapon::Remove()
 {
@@ -208,10 +199,7 @@ void PluginWeapon::Remove()
     if (!this->m_ptr)
         return;
 
-    weaponServices->m_hActiveWeapon = this->m_ptr;
-    itemServices->DropPlayerWeapon(this->m_ptr);
     weaponServices->RemoveWeapon(this->m_ptr);
-    this->m_ptr->Despawn();
 }
 
 std::vector<uint16_t> paintkitsFallbackCheck = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };

src/sdk/entity/CBaseEntity.h

@@ -167,11 +167,6 @@ class CBaseEntity : public CEntityInstance
         g_Signatures->FetchSignature<CEntityInstance_AcceptInput>("CEntityInstance_AcceptInput")(this, pInputName, pActivator, pCaller, &variantValue, outputID);
     }
 
-    void EmitSound(std::string sound_name, int pitch, float volume, float delay)
-    {
-        g_Signatures->FetchSignature<CBaseEntity_EmitSoundParams>("CBaseEntity_EmitSoundParams")(this, sound_name.c_str(), pitch, volume, delay);
-    }
-
     void EmitSoundFilter(IRecipientFilter& filter, std::string sound_name, int pitch, float volume)
     {
         EmitSound_t params;

src/sdk/entity/CCSPlayerPawn.h

@@ -8,12 +8,12 @@ class CCSPlayerPawn : public CBasePlayerPawn
 public:
     DECLARE_SCHEMA_CLASS_BASE(CCSPlayerPawn, false)
 
-    SCHEMA_FIELD_OFFSET(CCSPlayer_ActionTrackingServices *, m_pActionTrackingServices, 0)
-    SCHEMA_FIELD_OFFSET(CCSPlayer_ViewModelServices *, m_pViewModelServices, 0)
-    SCHEMA_FIELD_POINTER_OFFSET(CEconItemView, m_EconGloves, 0)
-    SCHEMA_FIELD_OFFSET(float, m_flHealthShotBoostExpirationTime, 0)
+    SCHEMA_FIELD_OFFSET(CCSPlayer_ActionTrackingServices*, m_pActionTrackingServices, 0);
+    SCHEMA_FIELD_OFFSET(CCSPlayer_ViewModelServices*, m_pViewModelServices, 0);
+    SCHEMA_FIELD_POINTER_OFFSET(CEconItemView, m_EconGloves, 0);
+    SCHEMA_FIELD_OFFSET(float, m_flHealthShotBoostExpirationTime, 0);
 
-    void GiveNamedItem(const char *item)
+    void GiveNamedItem(const char* item)
     {
         if (this->m_pItemServices() == nullptr)
             return;

src/sdk/entity/services.h

@@ -17,18 +17,18 @@ class CPlayerPawnComponent
 private:
     [[maybe_unused]] uint8_t __pad0008[0x28]; // 0x8
 public:
-    CBasePlayerPawn *m_pPawn; // 0x30
+    CBasePlayerPawn* m_pPawn; // 0x30
 };
 
 struct CSPerRoundStats_t
 {
 public:
     DECLARE_SCHEMA_CLASS_BASE(CSPerRoundStats_t, true)
 
-    SCHEMA_FIELD_OFFSET(int, m_iKills, 0)
-    SCHEMA_FIELD_OFFSET(int, m_iDeaths, 0)
-    SCHEMA_FIELD_OFFSET(int, m_iAssists, 0)
-    SCHEMA_FIELD_OFFSET(int, m_iDamage, 0)
+    SCHEMA_FIELD_OFFSET(int, m_iKills, 0);
+    SCHEMA_FIELD_OFFSET(int, m_iDeaths, 0);
+    SCHEMA_FIELD_OFFSET(int, m_iAssists, 0);
+    SCHEMA_FIELD_OFFSET(int, m_iDamage, 0);
 };
 
 struct CSMatchStats_t : public CSPerRoundStats_t
@@ -50,16 +50,14 @@ class CPlayer_MovementServices : public CPlayerPawnComponent
 public:
     DECLARE_SCHEMA_CLASS_BASE(CPlayer_MovementServices, false)
 
-    SCHEMA_FIELD_OFFSET(CInButtonState, m_nButtons, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nQueuedButtonDownMask, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nQueuedButtonChangeMask, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nButtonDoublePressed, 0)
-
-    // m_pButtonPressedCmdNumber[64]
-    SCHEMA_FIELD_POINTER_OFFSET(uint32_t, m_pButtonPressedCmdNumber, 0)
-    SCHEMA_FIELD_OFFSET(uint32_t, m_nLastCommandNumberProcessed, 0)
-    SCHEMA_FIELD_OFFSET(uint64_t, m_nToggleButtonDownMask, 0)
-    SCHEMA_FIELD_OFFSET(float, m_flMaxspeed, 0)
+    SCHEMA_FIELD_OFFSET(CInButtonState, m_nButtons, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nQueuedButtonDownMask, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nQueuedButtonChangeMask, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nButtonDoublePressed, 0);
+    SCHEMA_FIELD_POINTER_OFFSET(uint32_t, m_pButtonPressedCmdNumber, 0);
+    SCHEMA_FIELD_OFFSET(uint32_t, m_nLastCommandNumberProcessed, 0);
+    SCHEMA_FIELD_OFFSET(uint64_t, m_nToggleButtonDownMask, 0);
+    SCHEMA_FIELD_OFFSET(float, m_flMaxspeed, 0);
 };
 
 class CPlayer_MovementServices_Humanoid : CPlayer_MovementServices
@@ -89,9 +87,9 @@ class CCSPlayer_ItemServices
 
     virtual ~CCSPlayer_ItemServices() = 0;
 
-    SCHEMA_FIELD_OFFSET(bool, m_bHasDefuser, 0)
-    SCHEMA_FIELD_OFFSET(bool, m_bHasHelmet, 0)
-    SCHEMA_FIELD_OFFSET(bool, m_bHasHeavyArmor, 0)
+    SCHEMA_FIELD_OFFSET(bool, m_bHasDefuser, 0);
+    SCHEMA_FIELD_OFFSET(bool, m_bHasHelmet, 0);
+    SCHEMA_FIELD_OFFSET(bool, m_bHasHeavyArmor, 0);
 
 private:
     virtual void unk_01() = 0;
@@ -108,12 +106,12 @@ class CCSPlayer_ItemServices
     virtual void unk_12() = 0;
     virtual void unk_13() = 0;
     virtual void unk_14() = 0;
-    virtual CBaseEntity *_GiveNamedItem(const char *pchName) = 0;
+    virtual CBaseEntity* _GiveNamedItem(const char* pchName) = 0;
 
 public:
-    virtual bool GiveNamedItemBool(const char *pchName) = 0;
-    virtual CBaseEntity *GiveNamedItem(const char *pchName) = 0;
-    virtual void DropPlayerWeapon(CBasePlayerWeapon *weapon) = 0;
+    virtual bool GiveNamedItemBool(const char* pchName) = 0;
+    virtual CBaseEntity* GiveNamedItem(const char* pchName) = 0;
+    virtual void DropPlayerWeapon(CBasePlayerWeapon* weapon) = 0;
     virtual void StripPlayerWeapons() = 0;
 };
 
@@ -155,12 +153,20 @@ class CPlayer_WeaponServices : public CPlayerPawnComponent
 public:
     DECLARE_SCHEMA_CLASS_BASE(CPlayer_WeaponServices, false)
 
-    SCHEMA_FIELD_POINTER_OFFSET(CUtlVector<CHandle<CBasePlayerWeapon>>, m_hMyWeapons, 0)
-    SCHEMA_FIELD_OFFSET(CHandle<CBasePlayerWeapon>, m_hActiveWeapon, 0)
+    SCHEMA_FIELD_POINTER_OFFSET(CUtlVector<CHandle<CBasePlayerWeapon>>, m_hMyWeapons, 0);
+    SCHEMA_FIELD_OFFSET(CHandle<CBasePlayerWeapon>, m_hActiveWeapon, 0);
+
+    void DropWeapon(CBasePlayerWeapon* pWeapon, Vector* pVecTarget = nullptr, Vector* pVelocity = nullptr)
+    {
+        static int offset = g_Offsets->GetOffset("CCSPlayer_WeaponServices_DropWeapon");
+        CALL_VIRTUAL(void, offset, this, pWeapon, pVecTarget, pVelocity);
+    }
 
-    void RemoveWeapon(CBasePlayerWeapon *weapon)
+    void RemoveWeapon(CBasePlayerWeapon* weapon)
     {
+        this->DropWeapon(weapon);
         CALL_VIRTUAL(void, 20, weapon, nullptr, nullptr);
+        weapon->Despawn();
     }
 };
 
@@ -169,6 +175,6 @@ class CCSPlayerController_InventoryServices
 public:
     DECLARE_SCHEMA_CLASS_BASE(CCSPlayerController_InventoryServices, false)
 
-    SCHEMA_FIELD_OFFSET(uint16_t, m_unMusicID, 0)
-    SCHEMA_FIELD_POINTER_OFFSET(uint8_t, m_rank, 0)
+    SCHEMA_FIELD_OFFSET(uint16_t, m_unMusicID, 0);
+    SCHEMA_FIELD_POINTER_OFFSET(uint8_t, m_rank, 0);
 };

src/signatures/Signatures.h

@@ -35,7 +35,6 @@ typedef void (*GiveNamedItem_t)(CCSPlayer_ItemServices*, const char*, int, int,
 typedef void (*CBasePlayerController_SetPawn)(CBasePlayerController*, CCSPlayerPawn*, bool, bool);
 typedef void (*CCSPlayerPawnBase_PostThink)(CCSPlayerPawnBase*);
 typedef void (*CBaseEntity_TakeDamageOld)(CBaseEntity*, CTakeDamageInfo*);
-typedef void (*CBaseEntity_EmitSoundParams)(CBaseEntity*, const char*, int, float, float);
 typedef void (*CCSPlayer_MovementServices_CheckJumpPre)(CCSPlayer_MovementServices*, void*);
 typedef SndOpEventGuid_t(*CBaseEntity_EmitSoundFilter)(IRecipientFilter& filter, CEntityIndex ent, const EmitSound_t& params);