Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'develop' into feature/xinput

Browse Source
This commit is contained in:
Edo
2021-09-09 10:39:59 +02:00
committed by GitHub
parent 570d2acdac e873b48571
commit 035b7f19d9
12 changed files with 114 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Game/Functions.cpp
View File

@ -289,6 +289,10 @@ namespace Game
Dvar_SetFromStringByName_t Dvar_SetFromStringByName = Dvar_SetFromStringByName_t(0x4F52E0);
Dvar_SetFromStringByNameFromSource_t Dvar_SetFromStringByNameFromSource = Dvar_SetFromStringByNameFromSource_t(0x4FC770);
Dvar_SetStringByName_t Dvar_SetStringByName = Dvar_SetStringByName_t(0x44F060);
Dvar_SetString_t Dvar_SetString = Dvar_SetString_t(0x4A9580);
Dvar_SetBool_t Dvar_SetBool = Dvar_SetBool_t(0x4A9510);
Dvar_SetFloat_t Dvar_SetFloat = Dvar_SetFloat_t(0x40BB20);
Dvar_SetInt_t Dvar_SetInt = Dvar_SetInt_t(0x421DA0);
SL_ConvertToString_t SL_ConvertToString = SL_ConvertToString_t(0x4EC1D0);
SL_GetString_t SL_GetString = SL_GetString_t(0x4CDC10);
@ -634,7 +638,7 @@ namespace Game
{
if (client->state < 5)
{
Components::Network::SendCommand(client->addr, "error", reason);
Components::Network::SendCommand(client->netchan.remoteAddress, "error", reason);
}
SV_KickClient(client, reason.data());

18
src/Game/Functions.hpp
View File

@ -253,15 +253,27 @@ namespace Game
typedef dvar_t* (__cdecl * Dvar_RegisterColor_t)(const char* name, float r, float g, float b, float a, int flags, const char* description);
extern Dvar_RegisterColor_t Dvar_RegisterColor;
typedef dvar_t*(__cdecl * Dvar_SetFromStringByName_t)(const char* cvar, const char* value);
typedef dvar_t* (__cdecl * Dvar_SetFromStringByName_t)(const char* cvar, const char* value);
extern Dvar_SetFromStringByName_t Dvar_SetFromStringByName;
typedef dvar_t*(__cdecl * Dvar_SetFromStringByNameFromSource_t)(const char* cvar, const char* value, DvarSetSource source);
typedef dvar_t* (__cdecl * Dvar_SetFromStringByNameFromSource_t)(const char* cvar, const char* value, DvarSetSource source);
extern Dvar_SetFromStringByNameFromSource_t Dvar_SetFromStringByNameFromSource;
typedef void(__cdecl * Dvar_SetStringByName_t)(const char* cvar, const char* value);
typedef void (__cdecl * Dvar_SetStringByName_t)(const char* cvar, const char* value);
extern Dvar_SetStringByName_t Dvar_SetStringByName;
typedef void (__cdecl * Dvar_SetString_t)(dvar_t* cvar, const char* value);
extern Dvar_SetString_t Dvar_SetString;
typedef void (__cdecl * Dvar_SetBool_t)(dvar_t* cvar, bool enabled);
extern Dvar_SetBool_t Dvar_SetBool;
typedef void (__cdecl * Dvar_SetFloat_t)(dvar_t* cvar, float value);
extern Dvar_SetFloat_t Dvar_SetFloat;
typedef void (__cdecl * Dvar_SetInt_t)(dvar_t* cvar, int integer);
extern Dvar_SetInt_t Dvar_SetInt;
typedef void(__cdecl * Dvar_GetUnpackedColorByName_t)(const char* name, float* color);
extern Dvar_GetUnpackedColorByName_t Dvar_GetUnpackedColorByName;

101
src/Game/Structs.hpp
View File

@ -74,7 +74,7 @@ namespace Game
ASSET_TYPE_INVALID = -1,
};
typedef enum
typedef enum : unsigned int
{
DVAR_FLAG_NONE = 0x0, //no flags
DVAR_FLAG_SAVED = 0x1, //saves in config_mp.cfg for clients
@ -152,7 +152,7 @@ namespace Game
DVAR_SOURCE_DEVGUI = 0x3,
};
typedef enum
typedef enum : char
{
DVAR_TYPE_BOOL = 0x0,
DVAR_TYPE_FLOAT = 0x1,
@ -3212,7 +3212,7 @@ namespace Game
const char *name;
const char *description;
unsigned int flags;
char type;
dvar_type type;
bool modified;
DvarValue current;
DvarValue latched;
@ -5015,6 +5015,35 @@ namespace Game
char ipx[10];
};
struct netProfileInfo_t
{
char __pad0[0x5E0];
};
static_assert(sizeof(netProfileInfo_t) == 0x5E0);
struct netchan_t
{
int outgoingSequence;
netsrc_t sock;
int dropped;
int incomingSequence;
netadr_t remoteAddress;
int qport;
int fragmentSequence;
int fragmentLength;
char* fragmentBuffer;
int fragmentBufferSize;
int unsentFragments;
int unsentFragmentStart;
int unsentLength;
char* unsentBuffer;
int unsentBufferSize;
netProfileInfo_t prof;
};
static_assert(sizeof(netchan_t) == 0x62C);
struct FxEditorElemAtlas
{
int behavior;
@ -5376,50 +5405,34 @@ namespace Game
#pragma pack(push, 1)
typedef struct client_s
{
// 0
clientstate_t state;
// 4
char _pad[4];
// 8
int deltaMessage;
// 12
char __pad[12];
// 24
int outgoingSequence;
// 28
char pad[12];
// 40
netadr_t addr;
// 60
char pad1[1568];
// 1628
char connectInfoString[1024];
// 2652
char pad2[133192];
// 135844
char name[16];
// 135860
char pad3[12];
// 135872
int snapNum;
// 135876
int pad4;
// 135880
short ping;
// 135882
//char pad5[142390];
char pad5[133158];
// 269040
int isBot;
// 269044
char pad6[9228];
// 278272
unsigned __int64 steamid;
// 278280
char pad7[403592];
clientstate_t state; // 0
char __pad0[4]; // 4
int deltaMessage; // 8
char __pad1[12]; // 12
netchan_t netchan; // 24
char __pad2[20]; // 1604
const char* delayDropReason; // 1624
char connectInfoString[1024]; // 1628
char __pad3[132096]; // 2652
int reliableSequence; // 134748
int reliableAcknowledge; // 134752
int reliableSent; // 134756
char __pad4[1084]; // 134760
char name[16]; // 135844
char __pad5[12]; // 135860
int snapNum; // 135872
int __pad6; // 135876
short ping; // 135880
char __pad7[133158]; // 135882
int isBot; // 269040
char __pad8[9228]; // 269044
unsigned __int64 steamID; // 278272
char __pad9[403592]; // 278280
} client_t;
#pragma pack(pop)
static_assert(sizeof(client_t) == 0xA6790);
struct CModelAllocData
{
void* mainArray;