Implement RG_CBasePlayer_RemoveAllItems hook (#310)

* Implement RG_CBasePlayer_RemoveAllItems hook
rehlds · May 8, 2024 · 1dcc1ca · 1dcc1ca
1 parent a7043d1
commit 1dcc1ca
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc b/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
@@ -934,6 +934,12 @@ enum GamedllFunc_CBasePlayer
 	* Params:           (const this)
 	*/
 	RG_CBasePlayer_Observer_Think,
+
+	/*
+	* Description:      -
+	* Params:           (const this, bool:removeSuit)
+	*/
+	RG_CBasePlayer_RemoveAllItems,
 };
 
 /**

diff --git a/reapi/include/cssdk/dlls/regamedll_api.h b/reapi/include/cssdk/dlls/regamedll_api.h
@@ -40,7 +40,7 @@
 #include <API/CSInterfaces.h>
 
 #define REGAMEDLL_API_VERSION_MAJOR 5
-#define REGAMEDLL_API_VERSION_MINOR 22
+#define REGAMEDLL_API_VERSION_MINOR 27
 
 // CBasePlayer::Spawn hook
 typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Spawn;
@@ -626,6 +626,10 @@ typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBa
 typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Observer_Think;
 typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_Observer_Think;
 
+// CBasePlayer::RemoveAllItems hook
+typedef IHookChainClass<void, class CBasePlayer, BOOL> IReGameHook_CBasePlayer_RemoveAllItems;
+typedef IHookChainRegistryClass<void, class CBasePlayer, BOOL> IReGameHookRegistry_CBasePlayer_RemoveAllItems;
+
 class IReGameHookchains {
 public:
 	virtual ~IReGameHookchains() {}
@@ -773,7 +777,7 @@ class IReGameHookchains {
 	virtual IReGameHookRegistry_AddMultiDamage *AddMultiDamage() = 0;
 	virtual IReGameHookRegistry_ApplyMultiDamage *ApplyMultiDamage() = 0;
 	virtual IReGameHookRegistry_BuyItem *BuyItem() = 0;
-	virtual IReGameHookRegistry_CSGameRules_Think *CSGameRules_Think() = 0;	
+	virtual IReGameHookRegistry_CSGameRules_Think *CSGameRules_Think() = 0;
 	virtual IReGameHookRegistry_CSGameRules_TeamFull *CSGameRules_TeamFull() = 0;
 	virtual IReGameHookRegistry_CSGameRules_TeamStacked *CSGameRules_TeamStacked() = 0;
 	virtual IReGameHookRegistry_CSGameRules_PlayerGotWeapon *CSGameRules_PlayerGotWeapon() = 0;
@@ -787,7 +791,7 @@ class IReGameHookchains {
 
 	virtual IReGameHookRegistry_CBasePlayer_PlayerDeathThink *CBasePlayer_PlayerDeathThink() = 0;
 	virtual IReGameHookRegistry_CBasePlayer_Observer_Think *CBasePlayer_Observer_Think() = 0;
-
+	virtual IReGameHookRegistry_CBasePlayer_RemoveAllItems *CBasePlayer_RemoveAllItems() = 0;
 };
 
 struct ReGameFuncs_t {

diff --git a/reapi/src/hook_callback.cpp b/reapi/src/hook_callback.cpp
@@ -1730,6 +1730,16 @@ void CBasePlayer_Observer_Think(IReGameHook_CBasePlayer_Observer_Think *chain, C
 	callVoidForward(RG_CBasePlayer_Observer_Think, original, indexOfEdict(pthis->pev));
 }
 
+void CBasePlayer_RemoveAllItems(IReGameHook_CBasePlayer_RemoveAllItems *chain, CBasePlayer *pthis, BOOL removeSuit)
+{
+	auto original = [chain](int _pthis, BOOL _removeSuit)
+	{
+		chain->callNext(getPrivate<CBasePlayer>(_pthis), _removeSuit);
+	};
+
+	callVoidForward(RG_CBasePlayer_RemoveAllItems, original, indexOfEdict(pthis->pev), removeSuit);
+}
+
 /*
 * VTC functions
 */

diff --git a/reapi/src/hook_callback.h b/reapi/src/hook_callback.h
@@ -560,6 +560,7 @@ void CBasePlayerWeapon_KickBack(IReGameHook_CBasePlayerWeapon_KickBack *chain, C
 void CBasePlayerWeapon_SendWeaponAnim(IReGameHook_CBasePlayerWeapon_SendWeaponAnim *chain, CBasePlayerWeapon *pthis, int iAnim, int skiplocal);
 void CBasePlayer_PlayerDeathThink(IReGameHook_CBasePlayer_PlayerDeathThink *chain, CBasePlayer *pthis);
 void CBasePlayer_Observer_Think(IReGameHook_CBasePlayer_Observer_Think *chain, CBasePlayer *pthis);
+void CBasePlayer_RemoveAllItems(IReGameHook_CBasePlayer_RemoveAllItems *chain, CBasePlayer *pthis, BOOL removeSuit);
 
 /*
 * VTC functions

diff --git a/reapi/src/hook_list.cpp b/reapi/src/hook_list.cpp
@@ -215,6 +215,7 @@ hook_t hooklist_player[] = {
 
 	DLL(CBasePlayer_PlayerDeathThink),
 	DLL(CBasePlayer_Observer_Think),
+	DLL(CBasePlayer_RemoveAllItems),
 };
 
 hook_t hooklist_gamerules[] = {

diff --git a/reapi/src/hook_list.h b/reapi/src/hook_list.h
@@ -238,6 +238,7 @@ enum GamedllFunc_CBasePlayer
 
 	RG_CBasePlayer_PlayerDeathThink,
 	RG_CBasePlayer_Observer_Think,
+	RG_CBasePlayer_RemoveAllItems,
 
 	// [...]
 };

diff --git a/reapi/version/version.h b/reapi/version/version.h
@@ -6,5 +6,5 @@
 #pragma once
 
 #define VERSION_MAJOR		5
-#define VERSION_MINOR		24
+#define VERSION_MINOR		25
 #define VERSION_MAINTENANCE	0