From 016a08a58a0855e334c8ec739ed42a540a4c5ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=AF=E5=AE=9A=E9=BE=99?=
 <52111952+overl4y@users.noreply.github.com>
Date: Wed, 31 Jan 2024 08:46:19 -0400
Subject: [PATCH] API: PlayerDeathThink and Observer_Think (#301)

---
 .../scripting/include/reapi_gamedll_const.inc | 12 ++++++++++++
 reapi/include/cssdk/dlls/regamedll_api.h      |  6 ++++++
 reapi/src/hook_callback.cpp                   | 19 +++++++++++++++++++
 reapi/src/hook_callback.h                     |  2 ++
 reapi/src/hook_list.cpp                       |  3 +++
 reapi/src/hook_list.h                         |  3 +++
 6 files changed, 45 insertions(+)

diff --git a/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc b/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
index 5f2d6ae..0b30309 100644
--- a/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
+++ b/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
@@ -914,6 +914,18 @@ enum GamedllFunc_CBasePlayer
 	* Params:           (const this)
 	*/
 	RG_CBasePlayer_EntSelectSpawnPoint,
+
+	/*
+	* Description:      -
+	* Params:           (const this)
+	*/
+	RG_CBasePlayer_PlayerDeathThink,
+
+	/*
+	* Description:      -
+	* Params:           (const this)
+	*/
+	RG_CBasePlayer_Observer_Think,
 };
 
 /**
diff --git a/reapi/include/cssdk/dlls/regamedll_api.h b/reapi/include/cssdk/dlls/regamedll_api.h
index 762d06d..dbf5087 100644
--- a/reapi/include/cssdk/dlls/regamedll_api.h
+++ b/reapi/include/cssdk/dlls/regamedll_api.h
@@ -622,6 +622,10 @@ typedef IHookChainRegistry<void, class CBaseEntity *, class CBasePlayer *, class
 typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_PlayerDeathThink;
 typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_PlayerDeathThink;
 
+// CBasePlayer::Observer_Think hook
+typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Observer_Think;
+typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_Observer_Think;
+
 class IReGameHookchains {
 public:
 	virtual ~IReGameHookchains() {}
@@ -782,6 +786,8 @@ public:
 	virtual IReGameHookRegistry_CSGameRules_SendDeathMessage *CSGameRules_SendDeathMessage() = 0;
 
 	virtual IReGameHookRegistry_CBasePlayer_PlayerDeathThink *CBasePlayer_PlayerDeathThink() = 0;
+	virtual IReGameHookRegistry_CBasePlayer_Observer_Think *CBasePlayer_Observer_Think() = 0;
+	
 };
 
 struct ReGameFuncs_t {
diff --git a/reapi/src/hook_callback.cpp b/reapi/src/hook_callback.cpp
index b1d6803..3c28604 100644
--- a/reapi/src/hook_callback.cpp
+++ b/reapi/src/hook_callback.cpp
@@ -1710,6 +1710,25 @@ void CBasePlayerWeapon_SendWeaponAnim(IReGameHook_CBasePlayerWeapon_SendWeaponAn
 	callVoidForward(RG_CBasePlayerWeapon_SendWeaponAnim, original, indexOfEdict(pthis->pev), iAnim, skiplocal);
 }
 
+void CBasePlayer_PlayerDeathThink(IReGameHook_CBasePlayer_PlayerDeathThink *chain, CBasePlayer *pthis)
+{
+	auto original = [chain](int _pthis)
+	{
+		chain->callNext(getPrivate<CBasePlayer>(_pthis));
+	};
+
+	callVoidForward(RG_CBasePlayer_PlayerDeathThink, original, indexOfEdict(pthis->pev));
+}
+
+void CBasePlayer_Observer_Think(IReGameHook_CBasePlayer_Observer_Think *chain, CBasePlayer *pthis)
+{
+	auto original = [chain](int _pthis)
+	{
+		chain->callNext(getPrivate<CBasePlayer>(_pthis));
+	};
+
+	callVoidForward(RG_CBasePlayer_Observer_Think, original, indexOfEdict(pthis->pev));
+}
 
 /*
 * VTC functions
diff --git a/reapi/src/hook_callback.h b/reapi/src/hook_callback.h
index af39e6a..ede4ad7 100644
--- a/reapi/src/hook_callback.h
+++ b/reapi/src/hook_callback.h
@@ -558,6 +558,8 @@ edict_t *CBasePlayer_EntSelectSpawnPoint(IReGameHook_CBasePlayer_EntSelectSpawnP
 void CBasePlayerWeapon_ItemPostFrame(IReGameHook_CBasePlayerWeapon_ItemPostFrame *chain, CBasePlayerWeapon *pthis);
 void CBasePlayerWeapon_KickBack(IReGameHook_CBasePlayerWeapon_KickBack *chain, CBasePlayerWeapon *pthis, float up_base, float lateral_base, float up_modifier, float lateral_modifier, float up_max, float lateral_max, int direction_change);
 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);
 
 /*
 * VTC functions
diff --git a/reapi/src/hook_list.cpp b/reapi/src/hook_list.cpp
index 870c95c..8f5bf54 100644
--- a/reapi/src/hook_list.cpp
+++ b/reapi/src/hook_list.cpp
@@ -212,6 +212,9 @@ hook_t hooklist_player[] = {
 
 	DLL(CBasePlayer_CheckTimeBasedDamage),
 	DLL(CBasePlayer_EntSelectSpawnPoint),
+
+	DLL(CBasePlayer_PlayerDeathThink),
+	DLL(CBasePlayer_Observer_Think),
 };
 
 hook_t hooklist_gamerules[] = {
diff --git a/reapi/src/hook_list.h b/reapi/src/hook_list.h
index 18483eb..6e6d9da 100644
--- a/reapi/src/hook_list.h
+++ b/reapi/src/hook_list.h
@@ -236,6 +236,9 @@ enum GamedllFunc_CBasePlayer
 	RG_CBasePlayer_CheckTimeBasedDamage,
 	RG_CBasePlayer_EntSelectSpawnPoint,
 
+	RG_CBasePlayer_PlayerDeathThink,
+	RG_CBasePlayer_Observer_Think,
+
 	// [...]
 };