From 4ec7239b570ac074bcd28cf9eb96100a540fdaa8 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 17 Sep 2022 23:34:36 +0200
Subject: [PATCH] Add 'CNetChan::ProcessMessages(..)' hook body

Compat from S0 to S7.
---
 r5dev/core/init.cpp       |  4 ++++
 r5dev/engine/net_chan.cpp | 15 +++++++++++++++
 r5dev/engine/net_chan.h   | 12 ++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index da25a767..6bbc3f50 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -182,6 +182,8 @@ void Systems_Init()
 #endif // !DEDICATED && GAMEDLL_S3
 
 	NET_Attach();
+	//NetChan_Attach();
+
 	ConCommand_Attach();
 	IConVar_Attach();
 	CKeyValueSystem_Attach();
@@ -306,6 +308,8 @@ void Systems_Shutdown()
 #endif // !DEDICATED && GAMEDLL_S3
 
 	NET_Detach();
+	//NetChan_Detach();
+
 	ConCommand_Detach();
 	IConVar_Detach();
 	CKeyValueSystem_Detach();
diff --git a/r5dev/engine/net_chan.cpp b/r5dev/engine/net_chan.cpp
index f283c880..d95fd30b 100644
--- a/r5dev/engine/net_chan.cpp
+++ b/r5dev/engine/net_chan.cpp
@@ -200,3 +200,18 @@ void CNetChan::Clear(bool bStopProcessing)
 {
 	v_NetChan_Clear(this, bStopProcessing);
 }
+
+bool CNetChan::ProcessMessages(CNetChan* pChan, bf_read* pMsg)
+{
+	return v_NetChan_ProcessMessages(pChan, pMsg);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void NetChan_Attach()
+{
+	DetourAttach((LPVOID*)&v_NetChan_ProcessMessages, &CNetChan::ProcessMessages);
+}
+void NetChan_Detach()
+{
+	DetourDetach((LPVOID*)&v_NetChan_ProcessMessages, &CNetChan::ProcessMessages);
+}
\ No newline at end of file
diff --git a/r5dev/engine/net_chan.h b/r5dev/engine/net_chan.h
index 9b774f59..4ca19ec4 100644
--- a/r5dev/engine/net_chan.h
+++ b/r5dev/engine/net_chan.h
@@ -101,6 +101,8 @@ public:
 
 	bool        IsOverflowed(void) const;
 	void        Clear(bool bStopProcessing);
+
+	static bool ProcessMessages(CNetChan* pChan, bf_read* pMsg);
 	//-----------------------------------------------------------------------------
 private:
 	bool                m_bProcessingMessages;
@@ -175,18 +177,25 @@ static_assert(sizeof(CNetChan) == 0x1AC8);
 
 inline CMemory p_NetChan_Clear;
 inline auto v_NetChan_Clear = p_NetChan_Clear.RCast<void (*)(CNetChan* pChannel, bool bStopProcessing)>();
+
+inline CMemory p_NetChan_ProcessMessages;
+inline auto v_NetChan_ProcessMessages = p_NetChan_ProcessMessages.RCast<bool (*)(CNetChan* pChan, bf_read* pMsg)>();
 ///////////////////////////////////////////////////////////////////////////////
 class VNetChannel : public IDetour
 {
 	virtual void GetAdr(void) const
 	{
 		spdlog::debug("| FUN: CNetChan::Clear                      : {:#18x} |\n", p_NetChan_Clear.GetPtr());
+		spdlog::debug("| FUN: CNetChan::ProcessMessages            : {:#18x} |\n", p_NetChan_ProcessMessages.GetPtr());
 		spdlog::debug("+----------------------------------------------------------------+\n");
 	}
 	virtual void GetFun(void) const
 	{
 		p_NetChan_Clear = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x88\x54\x24\x10\x53\x55\x57"), "xxxxxxx");
 		v_NetChan_Clear = p_NetChan_Clear.RCast<void (*)(CNetChan*, bool)>(); /*88 54 24 10 53 55 57*/
+
+		p_NetChan_ProcessMessages = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x57\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\xFA"), "xxxx?xxxx?xxxx????xxx");
+		v_NetChan_ProcessMessages = p_NetChan_ProcessMessages.RCast<bool (*)(CNetChan* pChan, bf_read* pMsg)>();/*48 89 5C 24 ?? 48 89 6C 24 ?? 57 48 81 EC ?? ?? ?? ?? 48 8B FA*/
 	}
 	virtual void GetVar(void) const { }
 	virtual void GetCon(void) const { }
@@ -196,4 +205,7 @@ class VNetChannel : public IDetour
 ///////////////////////////////////////////////////////////////////////////////
 REGISTER(VNetChannel);
 
+void NetChan_Attach();
+void NetChan_Detach();
+
 #endif // NET_CHAN_H