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

Slight project cleanup

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-04-02 12:27:35 +02:00
parent f2223d8bd7
commit 5d69d7284e
20 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/client/cdll_engine_int.cpp
View File

@ -3,7 +3,7 @@
#include "tier0/IConVar.h"
#include "tier0/cvar.h"
#include "tier0/commandline.h"
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
#include "client/cdll_engine_int.h"
#include "engine/net_chan.h"
#include "engine/cl_rcon.h"

2
r5dev/client/IVEngineClient.cpp → r5dev/client/vengineclient_impl.cpp
View File

@ -5,7 +5,7 @@
//=============================================================================//
#include "core/stdafx.h"
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
//#ifdef GAMEDLL_S3
bool* m_bRestrictServerCommands = reinterpret_cast<bool*>(g_mGameDll.StringSearch("DevShotGenerator_Init()").FindPatternSelf("88 05", ADDRESS::Direction::UP).ResolveRelativeAddressSelf(0x2).OffsetSelf(0x2).GetPtr());

0
r5dev/client/IVEngineClient.h → r5dev/client/vengineclient_impl.h
View File

4
r5dev/core/init.cpp
View File

@ -34,10 +34,10 @@
#include "vguimatsurface/MatSystemSurface.h"
#include "client/cdll_engine_int.h"
#endif // !DEDICATED
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
#ifndef CLIENT_DLL
#include "server/server.h"
#include "server/IVEngineServer.h"
#include "server/vengineserver_impl.h"
#endif // !CLIENT_DLL
#include "squirrel/sqinit.h"
#include "squirrel/sqapi.h"

21
r5dev/engine/baseclient.h
View File

@ -1,7 +1,8 @@
#pragma once
#include "vpc/keyvalues.h"
#include "common/protocol.h"
#include "engine/net_chan.h"
#include "server/IVEngineServer.h"
#include "server/vengineserver_impl.h"
//-----------------------------------------------------------------------------
// Forward declarations
@ -16,13 +17,13 @@ class CBaseClient
{
public:
CBaseClient* GetClient(int nIndex) const;
std::int32_t GetUserID(void) const;
std::int64_t GetOriginID(void) const;
int32_t GetUserID(void) const;
int64_t GetOriginID(void) const;
SIGNONSTATE GetSignonState(void) const;
PERSISTENCE GetPersistenceState(void) const;
CNetChan* GetNetChan(void) const;
void SetUserID(std::int32_t nUserID);
void SetOriginID(std::int64_t nOriginID);
void SetUserID(int32_t nUserID);
void SetOriginID(int64_t nOriginID);
void SetSignonState(SIGNONSTATE nSignonState);
void SetPersistenceState(PERSISTENCE nPersistenceState);
void SetNetChan(CNetChan* pNetChan); // !TODO: HACK!
@ -39,17 +40,17 @@ public:
private:
// [ PIXIE ]: AMOS PLEASE VERIFY STRUCT INTEGRITY FOR EARLIER SEASONS. THERE WAS A PADDING AFTER ORIGINID BEFORE.
char pad_0000[16]; //0x0000
std::int32_t m_nUserID; //0x0010
int32_t m_nUserID; //0x0010
char pad_0014[844]; //0x0014
void* m_ConVars; //0x0360 This is a KeyValue*!
KeyValues* m_ConVars; //0x0360
char pad_0368[8]; //0x0368
CBaseServer* m_Server; //0x0370
char pad_0378[40]; //0x0378
CNetChan* m_NetChannel; //0x03A0
char pad_03A8[8]; //0x03A8
SIGNONSTATE m_nSignonState; //0x03B0
std::int32_t m_nDeltaTick; //0x03B4
std::int64_t m_nOriginID; //0x03B8
int32_t m_nDeltaTick; //0x03B4
int64_t m_nOriginID; //0x03B8
char pad_03C0[480]; //0x03C0
bool m_bFakePlayer; //0x05A0
bool m_bReceivedPacket; //0x05A1
@ -58,7 +59,7 @@ private:
char pad_05A4[24]; //0x05A4
PERSISTENCE m_nPersistenceState; //0x05BC
char pad_05C0[302676]; //0x05C0
std::int32_t m_LastMovementTick; //0x4A414
int32_t m_LastMovementTick; //0x4A414
char pad_4A418[168]; //0x4A418
};
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)

2
r5dev/engine/host_state.cpp
View File

@ -31,7 +31,7 @@
#ifndef DEDICATED
#include "vgui/vgui_baseui_interface.h"
#endif // DEDICATED
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
#include "networksystem/pylon.h"
#include "public/include/bansystem.h"
#include "public/include/edict.h"

6
r5dev/engine/net_chan.h
View File

@ -35,7 +35,7 @@ struct netframe_t
};
//-----------------------------------------------------------------------------
struct __declspec(align(8)) netflow_t
struct netflow_t
{
float nextcompute;
float avgbytespersec;
@ -51,7 +51,7 @@ struct __declspec(align(8)) netflow_t
};
//-----------------------------------------------------------------------------
struct __declspec(align(4)) dataFragments_t
struct dataFragments_t
{
char* data;
int64_t block_size;
@ -75,7 +75,7 @@ enum EBufType
};
//-----------------------------------------------------------------------------
class __declspec(align(8)) CNetChan
class CNetChan
{
public:
const char* GetName(void) const;

2
r5dev/gameui/IBrowser.cpp
View File

@ -28,7 +28,7 @@ History:
#include "squirrel/sqinit.h"
#include "squirrel/sqapi.h"
#include "server/server.h"
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
#include "vpc/keyvalues.h"
#include "vpklib/packedstore.h"
#include "gameui/IBrowser.h"

2
r5dev/gameui/IConsole.cpp
View File

@ -19,7 +19,7 @@ History:
#include "windows/id3dx.h"
#include "windows/console.h"
#include "gameui/IConsole.h"
#include "client/IVEngineClient.h"
#include "client/vengineclient_impl.h"
//-----------------------------------------------------------------------------
// Purpose:

2
r5dev/launcher/IApplication.cpp
View File

@ -12,7 +12,7 @@
#include "engine/sys_dll2.h"
#include "engine/sv_main.h"
#include "engine/host_cmd.h"
#include "server/IVEngineServer.h"
#include "server/vengineserver_impl.h"
//-----------------------------------------------------------------------------
// Purpose:

2
r5dev/server/IVEngineServer.cpp → r5dev/server/vengineserver_impl.cpp
View File

@ -9,7 +9,7 @@
#include "common/protocol.h"
#include "engine/sys_utils.h"
#include "engine/baseclient.h"
#include "server/IVEngineServer.h"
#include "server/vengineserver_impl.h"
//-----------------------------------------------------------------------------
// Purpose: sets the persistence var in the CClient instance to 'ready'

0
r5dev/server/IVEngineServer.h → r5dev/server/vengineserver_impl.h
View File

8
r5dev/squirrel/sqvm.cpp
View File

@ -12,9 +12,11 @@
#include "engine/sys_utils.h"
#ifdef DEDICATED
#include "engine/sv_rcon.h"
#endif // DEDICATED
#else // DEDICATED
#include "client/cdll_engine_int.h"
#include "vgui/vgui_debugpanel.h"
#include "gameui/IConsole.h"
#endif
#include "squirrel/sqtype.h"
#include "squirrel/sqvm.h"
#include "squirrel/sqinit.h"
@ -368,9 +370,9 @@ SQBool HSQVM_CreateServerVM()
// Input : *chlclient -
// Output : True on success, false on failure
//---------------------------------------------------------------------------------
SQBool HSQVM_CreateClientVM(void* chlclient)
SQBool HSQVM_CreateClientVM(CHLClient* hlclient)
{
bool results = SQVM_CreateClientVM(chlclient);
bool results = SQVM_CreateClientVM(hlclient);
if (results)
DevMsg(eDLL_T::CLIENT, "Created CLIENT VM: '%p'\n", g_pClientVM.GetValue<HSQUIRRELVM>());
else

11
r5dev/squirrel/sqvm.h
View File

@ -1,5 +1,8 @@
#pragma once
#include "squirrel/sqtype.h"
#ifndef DEDICATED
#include "client/cdll_engine_int.h"
#endif // !DEDICATED
namespace
{
@ -51,10 +54,10 @@ namespace
#endif
#if !defined (DEDICATED) && defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2)
ADDRESS p_SQVM_CreateClientVM = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x83\xEC\x58\x48\x83\x3D\x00\x00\x00\x00\x00\x74\x05", "xxxxxxx?????xx");
SQBool(*SQVM_CreateClientVM)(void* chlclient) = (SQBool(*)(void*))p_SQVM_CreateClientVM.GetPtr(); /*48 83 EC 58 48 83 3D ? ? ? ? ? 74 05*/
SQBool(*SQVM_CreateClientVM)(CHLClient* hlclient) = (SQBool(*)(CHLClient*))p_SQVM_CreateClientVM.GetPtr(); /*48 83 EC 58 48 83 3D ? ? ? ? ? 74 05*/
#elif !defined (DEDICATED) && defined (GAMEDLL_S3)
ADDRESS p_SQVM_CreateClientVM = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x41\x57\x48\x83\xEC\x68\x48\x83\x3D\x00\x00\x00\x00\x00", "xxxxxxxxxxx?????");
SQBool(*SQVM_CreateClientVM)(void* chlclient) = (SQBool(*)(void*))p_SQVM_CreateClientVM.GetPtr(); /*40 53 41 57 48 83 EC 68 48 83 3D ? ? ? ? ?*/
SQBool(*SQVM_CreateClientVM)(CHLClient* hlclient) = (SQBool(*)(CHLClient*))p_SQVM_CreateClientVM.GetPtr(); /*40 53 41 57 48 83 EC 68 48 83 3D ? ? ? ? ?*/
#endif
#if !defined (DEDICATED)
ADDRESS p_SQVM_CreateUIVM = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x48\x83\xEC\x20\x48\x8B\x1D\x00\x00\x00\x00\xC6\x05\x00\x00\x00\x00\x00", "xxxxxxxxx????xx?????");
@ -86,7 +89,9 @@ SQInteger HSQVM_InitializeCLGlobalScriptStructs(SQVM* sqvm, SQCONTEXT context);
void HSQVM_InitializeSVGlobalScriptStructs(SQVM* sqvm);
SQBool HSQVM_CreateServerVM();
SQBool HSQVM_CreateClientVM(void* chlclient);
#ifndef DEDICATED
SQBool HSQVM_CreateClientVM(CHLClient* hlclient);
#endif // !DEDICATED
SQBool HSQVM_CreateUIVM();
const SQChar* SQVM_GetContextName(SQCONTEXT context);

6
r5dev/vproj/clientsdk.vcxproj
View File

@ -13,8 +13,7 @@
<ItemGroup>
<ClCompile Include="..\bsplib\bsplib.cpp" />
<ClCompile Include="..\client\cdll_engine_int.cpp" />
<ClCompile Include="..\client\client.cpp" />
<ClCompile Include="..\client\IVEngineClient.cpp" />
<ClCompile Include="..\client\vengineclient_impl.cpp" />
<ClCompile Include="..\common\opcodes.cpp" />
<ClCompile Include="..\core\dllmain.cpp" />
<ClCompile Include="..\core\init.cpp" />
@ -104,8 +103,7 @@
<ClInclude Include="..\appframework\iappsystem.h" />
<ClInclude Include="..\bsplib\bsplib.h" />
<ClInclude Include="..\client\cdll_engine_int.h" />
<ClInclude Include="..\client\client.h" />
<ClInclude Include="..\client\IVEngineClient.h" />
<ClInclude Include="..\client\vengineclient_impl.h" />
<ClInclude Include="..\common\igameserverdata.h" />
<ClInclude Include="..\common\netmessages.h" />
<ClInclude Include="..\common\opcodes.h" />

18
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -159,12 +159,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\client.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
<ClCompile Include="..\client\IVEngineClient.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
<ClCompile Include="..\client\cdll_engine_int.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
@ -393,17 +387,14 @@
<ClCompile Include="..\tier1\bitbuf.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
<ClCompile Include="..\client\vengineclient_impl.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\client\client.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\client\IVEngineClient.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\common\protocol.h">
<Filter>sdk\common</Filter>
</ClInclude>
@ -1139,6 +1130,9 @@
<ClInclude Include="..\tier1\bitbuf.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
<ClInclude Include="..\client\vengineclient_impl.h">
<Filter>sdk\client</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

8
r5dev/vproj/dedicated.vcxproj
View File

@ -124,7 +124,7 @@
<ClInclude Include="..\appframework\iappsystem.h" />
<ClInclude Include="..\bsplib\bsplib.h" />
<ClInclude Include="..\client\cdll_engine_int.h" />
<ClInclude Include="..\client\IVEngineClient.h" />
<ClInclude Include="..\client\vengineclient_impl.h" />
<ClInclude Include="..\common\igameserverdata.h" />
<ClInclude Include="..\common\netmessages.h" />
<ClInclude Include="..\common\opcodes.h" />
@ -192,7 +192,7 @@
<ClInclude Include="..\rtech\rtech_utils.h" />
<ClInclude Include="..\rtech\rtech_game.h" />
<ClInclude Include="..\rtech\stryder\stryder.h" />
<ClInclude Include="..\server\IVEngineServer.h" />
<ClInclude Include="..\server\vengineserver_impl.h" />
<ClInclude Include="..\server\server.h" />
<ClInclude Include="..\squirrel\sqapi.h" />
<ClInclude Include="..\squirrel\sqinit.h" />
@ -353,7 +353,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\bsplib\bsplib.cpp" />
<ClCompile Include="..\client\IVEngineClient.cpp" />
<ClCompile Include="..\client\vengineclient_impl.cpp" />
<ClCompile Include="..\common\opcodes.cpp" />
<ClCompile Include="..\core\dllmain.cpp" />
<ClCompile Include="..\core\init.cpp" />
@ -405,7 +405,7 @@
<ClCompile Include="..\rtech\rtech_utils.cpp" />
<ClCompile Include="..\rtech\rtech_game.cpp" />
<ClCompile Include="..\rtech\stryder\stryder.cpp" />
<ClCompile Include="..\server\IVEngineServer.cpp" />
<ClCompile Include="..\server\vengineserver_impl.cpp" />
<ClCompile Include="..\server\server.cpp" />
<ClCompile Include="..\squirrel\sqapi.cpp" />
<ClCompile Include="..\squirrel\sqinit.cpp" />

16
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -138,9 +138,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\IVEngineClient.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\common\opcodes.h">
<Filter>sdk\common</Filter>
</ClInclude>
@ -210,7 +207,7 @@
<ClInclude Include="..\rtech\rtech_utils.h">
<Filter>sdk\rtech</Filter>
</ClInclude>
<ClInclude Include="..\server\IVEngineServer.h">
<ClInclude Include="..\server\vengineserver_impl.h">
<Filter>sdk\server</Filter>
</ClInclude>
<ClInclude Include="..\squirrel\sqapi.h">
@ -828,11 +825,11 @@
<ClInclude Include="..\tier1\bitbuf.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
<ClInclude Include="..\client\vengineclient_impl.h">
<Filter>sdk\client</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\IVEngineClient.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
<ClCompile Include="..\common\opcodes.cpp">
<Filter>sdk\common</Filter>
</ClCompile>
@ -878,7 +875,7 @@
<ClCompile Include="..\rtech\rtech_utils.cpp">
<Filter>sdk\rtech</Filter>
</ClCompile>
<ClCompile Include="..\server\IVEngineServer.cpp">
<ClCompile Include="..\server\vengineserver_impl.cpp">
<Filter>sdk\server</Filter>
</ClCompile>
<ClCompile Include="..\squirrel\sqapi.cpp">
@ -1034,6 +1031,9 @@
<ClCompile Include="..\tier1\bitbuf.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
<ClCompile Include="..\client\vengineclient_impl.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\Dedicated.def" />

8
r5dev/vproj/gamesdk.vcxproj
View File

@ -13,7 +13,7 @@
<ItemGroup>
<ClCompile Include="..\bsplib\bsplib.cpp" />
<ClCompile Include="..\client\cdll_engine_int.cpp" />
<ClCompile Include="..\client\IVEngineClient.cpp" />
<ClCompile Include="..\client\vengineclient_impl.cpp" />
<ClCompile Include="..\common\opcodes.cpp" />
<ClCompile Include="..\core\dllmain.cpp" />
<ClCompile Include="..\core\init.cpp" />
@ -73,7 +73,7 @@
<ClCompile Include="..\rtech\rtech_game.cpp" />
<ClCompile Include="..\rtech\rui\rui.cpp" />
<ClCompile Include="..\rtech\stryder\stryder.cpp" />
<ClCompile Include="..\server\IVEngineServer.cpp" />
<ClCompile Include="..\server\vengineserver_impl.cpp" />
<ClCompile Include="..\server\server.cpp" />
<ClCompile Include="..\squirrel\sqapi.cpp" />
<ClCompile Include="..\squirrel\sqinit.cpp" />
@ -110,7 +110,7 @@
<ClInclude Include="..\appframework\iappsystem.h" />
<ClInclude Include="..\bsplib\bsplib.h" />
<ClInclude Include="..\client\cdll_engine_int.h" />
<ClInclude Include="..\client\IVEngineClient.h" />
<ClInclude Include="..\client\vengineclient_impl.h" />
<ClInclude Include="..\common\igameserverdata.h" />
<ClInclude Include="..\common\netmessages.h" />
<ClInclude Include="..\common\opcodes.h" />
@ -189,7 +189,7 @@
<ClInclude Include="..\rtech\rtech_game.h" />
<ClInclude Include="..\rtech\rui\rui.h" />
<ClInclude Include="..\rtech\stryder\stryder.h" />
<ClInclude Include="..\server\IVEngineServer.h" />
<ClInclude Include="..\server\vengineserver_impl.h" />
<ClInclude Include="..\server\server.h" />
<ClInclude Include="..\squirrel\sqapi.h" />
<ClInclude Include="..\squirrel\sqinit.h" />

8
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -168,7 +168,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\IVEngineClient.cpp">
<ClCompile Include="..\client\vengineclient_impl.cpp">
<Filter>sdk\client</Filter>
</ClCompile>
<ClCompile Include="..\client\cdll_engine_int.cpp">
@ -219,7 +219,7 @@
<ClCompile Include="..\launcher\IApplication.cpp">
<Filter>sdk\launcher</Filter>
</ClCompile>
<ClCompile Include="..\server\IVEngineServer.cpp">
<ClCompile Include="..\server\vengineserver_impl.cpp">
<Filter>sdk\server</Filter>
</ClCompile>
<ClCompile Include="..\squirrel\sqvm.cpp">
@ -425,7 +425,7 @@
<ClInclude Include="..\client\cdll_engine_int.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\client\IVEngineClient.h">
<ClInclude Include="..\client\vengineclient_impl.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\common\protocol.h">
@ -494,7 +494,7 @@
<ClInclude Include="..\networksystem\sm_protocol.h">
<Filter>sdk\networksystem</Filter>
</ClInclude>
<ClInclude Include="..\server\IVEngineServer.h">
<ClInclude Include="..\server\vengineserver_impl.h">
<Filter>sdk\server</Filter>
</ClInclude>
<ClInclude Include="..\squirrel\sqapi.h">