WeaponsPrecache hook

Nostalgia-Gamers · Jan 3, 2024 · 8c70f4f · 8c70f4f
1 parent 0141284
commit 8c70f4f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/regamedll/dlls/API/CAPI_Impl.cpp b/regamedll/dlls/API/CAPI_Impl.cpp
@@ -321,6 +321,7 @@ GAMEHOOK_REGISTRY(ClearMultiDamage);
 GAMEHOOK_REGISTRY(AddMultiDamage);
 GAMEHOOK_REGISTRY(ApplyMultiDamage);
 GAMEHOOK_REGISTRY(BuyItem);
+GAMEHOOK_REGISTRY(WeaponsPrecache);
 GAMEHOOK_REGISTRY(CSGameRules_Think);
 GAMEHOOK_REGISTRY(CSGameRules_TeamFull);
 GAMEHOOK_REGISTRY(CSGameRules_TeamStacked);

diff --git a/regamedll/dlls/API/CAPI_Impl.h b/regamedll/dlls/API/CAPI_Impl.h
@@ -693,6 +693,10 @@ typedef IHookChainRegistryImpl<void, entvars_t *, entvars_t *> CReGameHookRegist
 typedef IHookChainImpl<void, CBasePlayer *, int> CReGameHook_BuyItem;
 typedef IHookChainRegistryImpl<void, CBasePlayer *, int> CReGameHookRegistry_BuyItem;
 
+// WeaponsPrecache hook
+typedef IHookChainImpl<void> CReGameHook_WeaponsPrecache;
+typedef IHookChainRegistryImpl<void> CReGameHookRegistry_WeaponsPrecache;
+
 // CHalfLifeMultiplay::Think hook
 typedef IHookChainClassImpl<void, class CHalfLifeMultiplay> CReGameHook_CSGameRules_Think;
 typedef IHookChainRegistryClassEmptyImpl<void, class CHalfLifeMultiplay> CReGameHookRegistry_CSGameRules_Think;
@@ -891,6 +895,7 @@ class CReGameHookchains: public IReGameHookchains {
 	CReGameHookRegistry_AddMultiDamage m_AddMultiDamage;
 	CReGameHookRegistry_ApplyMultiDamage m_ApplyMultiDamage;
 	CReGameHookRegistry_BuyItem m_BuyItem;
+	CReGameHookRegistry_WeaponsPrecache m_WeaponsPrecache;
 	CReGameHookRegistry_CSGameRules_Think m_CSGameRules_Think;
 	CReGameHookRegistry_CSGameRules_TeamFull m_CSGameRules_TeamFull;
 	CReGameHookRegistry_CSGameRules_TeamStacked m_CSGameRules_TeamStacked;
@@ -1050,6 +1055,7 @@ class CReGameHookchains: public IReGameHookchains {
 	virtual IReGameHookRegistry_AddMultiDamage *AddMultiDamage();
 	virtual IReGameHookRegistry_ApplyMultiDamage *ApplyMultiDamage();
 	virtual IReGameHookRegistry_BuyItem *BuyItem();
+	virtual IReGameHookRegistry_WeaponsPrecache* WeaponsPrecache();
 	virtual IReGameHookRegistry_CSGameRules_Think *CSGameRules_Think();
 	virtual IReGameHookRegistry_CSGameRules_TeamFull *CSGameRules_TeamFull();
 	virtual IReGameHookRegistry_CSGameRules_TeamStacked *CSGameRules_TeamStacked();

diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
@@ -294,9 +294,10 @@ void UTIL_PrecacheOtherWeapon(const char *szClassname)
 // Called by worldspawn
 void WeaponsPrecache()
 {
+#ifndef REGAMEDLL_ADD
 	Q_memset(CBasePlayerItem::m_ItemInfoArray, 0, sizeof(CBasePlayerItem::m_ItemInfoArray));
 	Q_memset(CBasePlayerItem::m_AmmoInfoArray, 0, sizeof(CBasePlayerItem::m_AmmoInfoArray));
-
+#endif
 	giAmmoIndex = 0;
 
 	// custom items...

diff --git a/regamedll/dlls/world.cpp b/regamedll/dlls/world.cpp
@@ -321,7 +321,14 @@ void CWorld::Precache()
 	// player precaches
 	// get weapon precaches
 
+#ifdef REGAMEDLL_ADD
+	Q_memset(CBasePlayerItem::m_ItemInfoArray, 0, sizeof(CBasePlayerItem::m_ItemInfoArray));
+	Q_memset(CBasePlayerItem::m_AmmoInfoArray, 0, sizeof(CBasePlayerItem::m_AmmoInfoArray));
+
+	g_ReGameHookchains.m_WeaponsPrecache.callChain(WeaponsPrecache);
+#else
 	WeaponsPrecache();
+#endif
 	ClientPrecache();
 	BotPrecache();
 

diff --git a/regamedll/public/regamedll/regamedll_api.h b/regamedll/public/regamedll/regamedll_api.h
@@ -572,6 +572,10 @@ typedef IHookChainRegistry<void, entvars_t *, entvars_t *> IReGameHookRegistry_A
 typedef IHookChain<void, CBasePlayer *, int> IReGameHook_BuyItem;
 typedef IHookChainRegistry<void, CBasePlayer *, int> IReGameHookRegistry_BuyItem;
 
+// WeaponsPrecache hook
+typedef IHookChain<void> IReGameHook_WeaponsPrecache;
+typedef IHookChainRegistry<void> IReGameHookRegistry_WeaponsPrecache;
+
 // CHalfLifeMultiplay::Think hook
 typedef IHookChain<void> IReGameHook_CSGameRules_Think;
 typedef IHookChainRegistry<void> IReGameHookRegistry_CSGameRules_Think;
@@ -771,6 +775,7 @@ class IReGameHookchains {
 	virtual IReGameHookRegistry_AddMultiDamage *AddMultiDamage() = 0;
 	virtual IReGameHookRegistry_ApplyMultiDamage *ApplyMultiDamage() = 0;
 	virtual IReGameHookRegistry_BuyItem *BuyItem() = 0;
+	virtual IReGameHookRegistry_WeaponsPrecache* WeaponsPrecache() = 0;
 	virtual IReGameHookRegistry_CSGameRules_Think *CSGameRules_Think() = 0;
 	virtual IReGameHookRegistry_CSGameRules_TeamFull *CSGameRules_TeamFull() = 0;
 	virtual IReGameHookRegistry_CSGameRules_TeamStacked *CSGameRules_TeamStacked() = 0;