R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed CBaseClient::Clear to void type.

Browse Source
This commit is contained in:
PixieCore 2022-03-28 14:22:27 +02:00
parent bccd936040
commit 433a3b27a2
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
r5dev/engine/baseclient.cpp
View File

@ -23,7 +23,7 @@ CBaseClient* CBaseClient::GetClient(int nIndex) const
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Purpose: gets the userID of this client // Purpose: gets the userID of this client
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
int32_t CBaseClient::GetUserID(void) const std::int32_t CBaseClient::GetUserID(void) const
{ {
return m_nUserID; return m_nUserID;
} }
@ -31,7 +31,7 @@ int32_t CBaseClient::GetUserID(void) const
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Purpose: gets the userID of this client // Purpose: gets the userID of this client
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
int64_t CBaseClient::GetOriginID(void) const std::int64_t CBaseClient::GetOriginID(void) const
{ {
return m_nOriginID; return m_nOriginID;
} }
@ -63,7 +63,7 @@ void* CBaseClient::GetNetChan(void) const
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Purpose: sets the userID of this client // Purpose: sets the userID of this client
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
void CBaseClient::SetUserID(int32_t nUserID) void CBaseClient::SetUserID(std::int32_t nUserID)
{ {
m_nUserID = nUserID; m_nUserID = nUserID;
} }
@ -71,7 +71,7 @@ void CBaseClient::SetUserID(int32_t nUserID)
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Purpose: sets the originID of this client // Purpose: sets the originID of this client
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
void CBaseClient::SetOriginID(int64_t nOriginID) void CBaseClient::SetOriginID(std::int64_t nOriginID)
{ {
m_nOriginID = nOriginID; m_nOriginID = nOriginID;
} }
@ -174,9 +174,9 @@ bool CBaseClient::IsHumanPlayer(void) const
// Purpose: throw away any residual garbage in the channel // Purpose: throw away any residual garbage in the channel
// Input : *pBaseClient - // Input : *pBaseClient -
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
void* CBaseClient::Clear(CBaseClient* pBaseClient) void CBaseClient::Clear(CBaseClient* pBaseClient)
{ {
return CBaseClient_Clear(pBaseClient); CBaseClient_Clear(pBaseClient);
} }
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------

20
r5dev/engine/baseclient.h
View File

@ -15,13 +15,13 @@ class CBaseClient
{ {
public: public:
CBaseClient* GetClient(int nIndex) const; CBaseClient* GetClient(int nIndex) const;
int32_t GetUserID(void) const; std::int32_t GetUserID(void) const;
int64_t GetOriginID(void) const; std::int64_t GetOriginID(void) const;
SIGNONSTATE GetSignonState(void) const; SIGNONSTATE GetSignonState(void) const;
PERSISTENCE GetPersistenceState(void) const; PERSISTENCE GetPersistenceState(void) const;
void* GetNetChan(void) const; void* GetNetChan(void) const;
void SetUserID(int32_t nUserID); void SetUserID(std::int32_t nUserID);
void SetOriginID(int64_t nOriginID); void SetOriginID(std::int64_t nOriginID);
void SetSignonState(SIGNONSTATE nSignonState); void SetSignonState(SIGNONSTATE nSignonState);
void SetPersistenceState(PERSISTENCE nPersistenceState); void SetPersistenceState(PERSISTENCE nPersistenceState);
void SetNetChan(void* pNetChan); // !TODO: HACK! void SetNetChan(void* pNetChan); // !TODO: HACK!
@ -33,7 +33,7 @@ public:
bool IsFakeClient(void) const; bool IsFakeClient(void) const;
bool IsHumanPlayer(void) const; bool IsHumanPlayer(void) const;
static bool Connect(CBaseClient* pClient, const char* szName, void* pNetChannel, bool bFakePlayer, void* a5, char* szMessage, int nMessageSize); static bool Connect(CBaseClient* pClient, const char* szName, void* pNetChannel, bool bFakePlayer, void* a5, char* szMessage, int nMessageSize);
static void* Clear(CBaseClient* pBaseClient); static void Clear(CBaseClient* pBaseClient);
private: private:
// [ PIXIE ]: AMOS PLEASE VERIFY STRUCT INTEGRITY FOR EARLIER SEASONS. THERE WAS A PADDING AFTER ORIGINID BEFORE. // [ PIXIE ]: AMOS PLEASE VERIFY STRUCT INTEGRITY FOR EARLIER SEASONS. THERE WAS A PADDING AFTER ORIGINID BEFORE.
@ -59,8 +59,13 @@ private:
char pad_05C0[302676]; //0x05C0 char pad_05C0[302676]; //0x05C0
std::int32_t m_LastMovementTick; //0x4A414 std::int32_t m_LastMovementTick; //0x4A414
char pad_4A418[168]; //0x4A418 char pad_4A418[168]; //0x4A418
}; };
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
static_assert(sizeof(CBaseClient) == 0x4A440);
#else
static_assert(sizeof(CBaseClient) == 0x4A4C0);
#endif
namespace namespace
{ {
@ -69,11 +74,10 @@ namespace
bool (*CBaseClient_Connect)(CBaseClient* pClient, const char* szName, void* pNetChannel, bool bFakePlayer, void* a5, char* szMessage, int nMessageSize) = (bool (*)(CBaseClient*, const char*, void*, bool, void*, char*, int))p_CBaseClient_Connect.GetPtr(); bool (*CBaseClient_Connect)(CBaseClient* pClient, const char* szName, void* pNetChannel, bool bFakePlayer, void* a5, char* szMessage, int nMessageSize) = (bool (*)(CBaseClient*, const char*, void*, bool, void*, char*, int))p_CBaseClient_Connect.GetPtr();
ADDRESS p_CBaseClient_Clear = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x41\x56\x41\x57\x48\x83\xEC\x20\x48\x8B\xD9\x48\x89\x74", "xxxxxxxxxxxxxxxx"); ADDRESS p_CBaseClient_Clear = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x41\x56\x41\x57\x48\x83\xEC\x20\x48\x8B\xD9\x48\x89\x74", "xxxxxxxxxxxxxxxx");
void* (*CBaseClient_Clear)(CBaseClient* pClient) = (void* (*)(CBaseClient*))p_CBaseClient_Clear.GetPtr(); /*40 53 41 56 41 57 48 83 EC 20 48 8B D9 48 89 74*/ void (*CBaseClient_Clear)(CBaseClient* pClient) = (void (*)(CBaseClient*))p_CBaseClient_Clear.GetPtr(); /*40 53 41 56 41 57 48 83 EC 20 48 8B D9 48 89 74*/
static ADDRESS g_pClientBuffer = p_IVEngineServer__PersistenceAvailable.FindPatternSelf("48 8D 0D", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7); static ADDRESS g_pClientBuffer = p_IVEngineServer__PersistenceAvailable.FindPatternSelf("48 8D 0D", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7);
// Notes for earlier seasons. // Notes for earlier seasons.
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) #if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
const std::uintptr_t g_dwCClientSize = 0x4A440; const std::uintptr_t g_dwCClientSize = 0x4A440;