Skip to content

Commit 7495864

Browse files
committed
chore(modules): Bump hl2sdk
1 parent 55f17ed commit 7495864

File tree

18 files changed

+1255
-1247
lines changed

18 files changed

+1255
-1247
lines changed

AMBuilder

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ for sdk_target in MMSPlugin.sdk_targets:
3535

3636
binary.sources.append(os.path.join(sdk['path'], 'entity2', 'entitysystem.cpp'))
3737
binary.sources.append(os.path.join(sdk['path'], 'entity2', 'entityidentity.cpp'))
38+
binary.sources.append(os.path.join(sdk['path'], 'entity2', 'entitykeyvalues.cpp'))
39+
binary.sources.append(os.path.join(sdk['path'], 'tier1', 'keyvalues3.cpp'))
3840

3941
if binary.compiler.target.platform == 'linux':
4042
binary.compiler.cxxflags += [

plugin_files/gamedata/signatures.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
},
6262
"UTIL_Remove": {
6363
"lib": "server",
64-
"windows": "48 85 C9 74 ? 48 8B D1 48 8B 0D ? ? ? ?",
65-
"linux": "48 89 FE 48 85 FF 74 ? 48 8D 05 ? ? ? ? 48"
64+
"windows": "48 85 C9 74 2A 48 8B D1 48 8B 0D 2A 2A 2A 2A",
65+
"linux": "48 89 FE 48 85 FF 74 2A 48 8D 05 2A 2A 2A 2A 48"
6666
},
6767
"LegacyGameEventListener": {
6868
"lib": "server",
@@ -96,7 +96,7 @@
9696
},
9797
"CBasePlayerController_SetPawn": {
9898
"lib": "server",
99-
"windows": "44 88 4C 24 ? 55 56 57 41 54 41 56 48 8D 6C 24 ?",
99+
"windows": "48 89 74 24 2A 55 41 54 41 55 41 56 41 57 48 8D 6C 24 2A 48 81 EC 2A 2A 2A 2A 4C 8B F9",
100100
"linux": "55 48 89 E5 41 57 41 56 41 55 49 89 FD 41 54 45 89 C4"
101101
},
102102
"SendNetMessage": {

protobufs/cstrike15_usermessages.proto

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ enum ECstrike15UserMessages {
7777
CS_UM_CurrentRoundOdds = 380;
7878
CS_UM_DeepStats = 381;
7979
CS_UM_ShootInfo = 383;
80+
CS_UM_SnapTapStats = 384;
8081
}
8182

8283
enum ECSUsrMsg_DisconnectToLobby_Action {
@@ -593,3 +594,10 @@ message CCSUsrMsgPreMatchSayText {
593594
optional string text = 2;
594595
optional bool all_chat = 3;
595596
}
597+
598+
message CCSUsrMsg_SnapTapStats {
599+
optional uint32 perfect_bucket = 1;
600+
repeated uint32 overlap_bucket = 2;
601+
repeated uint32 underlap_bucket = 3;
602+
optional uint32 max_success_in_20 = 4;
603+
}

src/plugins/core/scripting/generated/GClasses1.cpp

Lines changed: 1072 additions & 1072 deletions
Large diffs are not rendered by default.

src/plugins/core/scripting/schema.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void scripting_StateUpdate(std::string ptr, std::string classname, std::string f
9797
else if (m_key.networked)
9898
{
9999
if (!isStruct)
100-
SetStateChanged((Z_CBaseEntity*)vPtr, m_key.offset);
100+
SetStateChanged((CBaseEntity*)vPtr, m_key.offset);
101101
else if (IsPlatformPosix())
102102
CALL_VIRTUAL(void, 1, vPtr, m_key.offset, 0xFFFFFFFF, 0xFFFF);
103103
}

src/plugins/core/scripting_includes.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
extern std::map<std::string, bool> BlockedCS2GuidelinesFields;
1919

2020
template <typename T>
21-
T GetSchemaValue(void *ptr, const char *className, const char *fieldName)
21+
T GetSchemaValue(void* ptr, const char* className, const char* fieldName)
2222
{
2323
if (fieldName)
2424
{
@@ -48,11 +48,11 @@ T GetSchemaValue(void *ptr, const char *className, const char *fieldName)
4848
auto prop_hash = hash_32_fnv1a_const(fieldName);
4949
auto m_key = sch::GetOffset(className, datatable_hash, fieldName, prop_hash);
5050

51-
return *reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr) + m_key.offset);
51+
return *reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr)+m_key.offset);
5252
}
5353

5454
template <typename T>
55-
T *GetSchemaValuePtr(void *ptr, const char *className, const char *fieldName)
55+
T* GetSchemaValuePtr(void* ptr, const char* className, const char* fieldName)
5656
{
5757
if (BlockedCS2GuidelinesFields.find(fieldName) != BlockedCS2GuidelinesFields.end() && g_Config->FetchValue<bool>("core.FollowCS2ServerGuidelines"))
5858
{
@@ -67,15 +67,15 @@ T *GetSchemaValuePtr(void *ptr, const char *className, const char *fieldName)
6767
auto prop_hash = hash_32_fnv1a_const(fieldName);
6868
auto m_key = sch::GetOffset(className, datatable_hash, fieldName, prop_hash);
6969

70-
return reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr) + m_key.offset);
70+
return reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr)+m_key.offset);
7171
}
7272

73-
void *GetSchemaPtr(void *ptr, const char *className, const char *fieldName);
73+
void* GetSchemaPtr(void* ptr, const char* className, const char* fieldName);
7474

75-
void WriteSchemaPtrValue(void *ptr, const char *className, const char *fieldName, bool isStruct, byte *value, int size);
75+
void WriteSchemaPtrValue(void* ptr, const char* className, const char* fieldName, bool isStruct, byte* value, int size);
7676

7777
template <typename T>
78-
void SetSchemaValue(void *ptr, const char *className, const char *fieldName, bool isStruct, T value)
78+
void SetSchemaValue(void* ptr, const char* className, const char* fieldName, bool isStruct, T value)
7979
{
8080
if (BlockedCS2GuidelinesFields.find(fieldName) != BlockedCS2GuidelinesFields.end() && g_Config->FetchValue<bool>("core.FollowCS2ServerGuidelines"))
8181
{
@@ -93,19 +93,19 @@ void SetSchemaValue(void *ptr, const char *className, const char *fieldName, boo
9393
auto m_chain = sch::FindChainOffset(className);
9494

9595
if (m_chain != 0 && m_key.networked)
96-
g_Signatures->FetchSignature<NetworkSTChange>("NetworkStateChanged")((uintptr_t)(ptr) + m_chain, m_key.offset, 0xFFFFFFFF);
96+
g_Signatures->FetchSignature<NetworkSTChange>("NetworkStateChanged")((uintptr_t)(ptr)+m_chain, m_key.offset, 0xFFFFFFFF);
9797
else if (m_key.networked)
9898
{
9999
if (!isStruct)
100-
SetStateChanged((Z_CBaseEntity *)ptr, m_key.offset);
100+
SetStateChanged((CBaseEntity*)ptr, m_key.offset);
101101
else if (IsPlatformPosix())
102102
CALL_VIRTUAL(void, 1, ptr, m_key.offset, 0xFFFFFFFF, 0xFFFF);
103103
}
104-
*reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr) + m_key.offset) = value;
104+
*reinterpret_cast<std::add_pointer_t<T>>((uintptr_t)(ptr)+m_key.offset) = value;
105105
}
106106

107107
template <typename T>
108-
void SetSchemaValueCUtlVector(void *ptr, const char *className, const char *fieldName, bool isStruct, std::vector<T> value)
108+
void SetSchemaValueCUtlVector(void* ptr, const char* className, const char* fieldName, bool isStruct, std::vector<T> value)
109109
{
110110
if (BlockedCS2GuidelinesFields.find(fieldName) != BlockedCS2GuidelinesFields.end() && g_Config->FetchValue<bool>("core.FollowCS2ServerGuidelines"))
111111
{
@@ -123,16 +123,16 @@ void SetSchemaValueCUtlVector(void *ptr, const char *className, const char *fiel
123123
auto m_chain = sch::FindChainOffset(className);
124124

125125
if (m_chain != 0 && m_key.networked)
126-
g_Signatures->FetchSignature<NetworkSTChange>("NetworkStateChanged")((uintptr_t)(ptr) + m_chain, m_key.offset, 0xFFFFFFFF);
126+
g_Signatures->FetchSignature<NetworkSTChange>("NetworkStateChanged")((uintptr_t)(ptr)+m_chain, m_key.offset, 0xFFFFFFFF);
127127
else if (m_key.networked)
128128
{
129129
if (!isStruct)
130-
SetStateChanged((Z_CBaseEntity *)ptr, m_key.offset);
130+
SetStateChanged((CBaseEntity*)ptr, m_key.offset);
131131
else if (IsPlatformPosix())
132132
CALL_VIRTUAL(void, 1, ptr, m_key.offset, 0xFFFFFFFF, 0xFFFF);
133133
}
134134

135-
CUtlVector<T> *vec = reinterpret_cast<CUtlVector<T> *>((uintptr_t)(ptr) + m_key.offset);
135+
CUtlVector<T>* vec = reinterpret_cast<CUtlVector<T> *>((uintptr_t)(ptr)+m_key.offset);
136136
vec->Purge();
137137
for (auto elem : value)
138138
vec->AddToTail(elem);

src/sdk/entity/CBaseEntity.h

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "../../entrypoint.h"
34
#include "../schema.h"
45
#include "../../signatures/Offsets.h"
56
#include "../../common.h"
@@ -13,10 +14,10 @@
1314
#define CS_TEAM_T 2
1415
#define CS_TEAM_CT 3
1516

16-
inline CEntityInstance *UTIL_FindEntityByClassname(CEntityInstance *pStart, const char *name)
17+
inline CEntityInstance* UTIL_FindEntityByClassname(CEntityInstance* pStart, const char* name)
1718
{
18-
extern CEntitySystem *g_pEntitySystem;
19-
CEntityIdentity *pEntity = pStart ? pStart->m_pEntity->m_pNext : g_pEntitySystem->m_EntityList.m_pFirstActiveEntity;
19+
extern CEntitySystem* g_pEntitySystem;
20+
CEntityIdentity* pEntity = pStart ? pStart->m_pEntity->m_pNext : g_pEntitySystem->m_EntityList.m_pFirstActiveEntity;
2021

2122
for (; pEntity; pEntity = pEntity->m_pNext)
2223
{
@@ -54,16 +55,16 @@ class CGameSceneNode
5455
public:
5556
DECLARE_SCHEMA_CLASS_BASE(CGameSceneNode, false)
5657

57-
SCHEMA_FIELD_OFFSET(CEntityInstance *, m_pOwner, 0)
58-
SCHEMA_FIELD_OFFSET(CGameSceneNode *, m_pParent, 0)
59-
SCHEMA_FIELD_OFFSET(CGameSceneNode *, m_pChild, 0)
60-
SCHEMA_FIELD_OFFSET(CNetworkOriginCellCoordQuantizedVector, m_vecOrigin, 0)
61-
SCHEMA_FIELD_OFFSET(QAngle, m_angRotation, 0)
62-
SCHEMA_FIELD_OFFSET(float, m_flScale, 0)
63-
SCHEMA_FIELD_OFFSET(float, m_flAbsScale, 0)
64-
SCHEMA_FIELD_OFFSET(Vector, m_vecAbsOrigin, 0)
65-
SCHEMA_FIELD_OFFSET(QAngle, m_angAbsRotation, 0)
66-
SCHEMA_FIELD_OFFSET(Vector, m_vRenderOrigin, 0)
58+
SCHEMA_FIELD_OFFSET(CEntityInstance*, m_pOwner, 0);
59+
SCHEMA_FIELD_OFFSET(CGameSceneNode*, m_pParent, 0);
60+
SCHEMA_FIELD_OFFSET(CGameSceneNode*, m_pChild, 0);
61+
SCHEMA_FIELD_OFFSET(CNetworkOriginCellCoordQuantizedVector, m_vecOrigin, 0);
62+
SCHEMA_FIELD_OFFSET(QAngle, m_angRotation, 0);
63+
SCHEMA_FIELD_OFFSET(float, m_flScale, 0);
64+
SCHEMA_FIELD_OFFSET(float, m_flAbsScale, 0);
65+
SCHEMA_FIELD_OFFSET(Vector, m_vecAbsOrigin, 0);
66+
SCHEMA_FIELD_OFFSET(QAngle, m_angAbsRotation, 0);
67+
SCHEMA_FIELD_OFFSET(Vector, m_vRenderOrigin, 0);
6768

6869
matrix3x4_t EntityToWorldTransform()
6970
{
@@ -101,9 +102,9 @@ class CGameSceneNode
101102
return mat;
102103
}
103104

104-
CSkeletonInstance *GetSkeletonInstance()
105+
CSkeletonInstance* GetSkeletonInstance()
105106
{
106-
return CALL_VIRTUAL(CSkeletonInstance *, 8, this);
107+
return CALL_VIRTUAL(CSkeletonInstance*, 8, this);
107108
}
108109
};
109110

@@ -112,36 +113,34 @@ class CBodyComponent
112113
public:
113114
DECLARE_SCHEMA_CLASS_BASE(CBodyComponent, false)
114115

115-
SCHEMA_FIELD_OFFSET(CGameSceneNode *, m_pSceneNode, 0)
116+
SCHEMA_FIELD_OFFSET(CGameSceneNode*, m_pSceneNode, 0)
116117
};
117118

118-
class Z_CBaseEntity : public CEntityInstance
119+
class CBaseEntity : public CEntityInstance
119120
{
120121
public:
121-
typedef Z_CBaseEntity ThisClass;
122-
static constexpr const char *ThisClassName = "CBaseEntity";
123-
static constexpr bool IsStruct = false;
124-
125-
SCHEMA_FIELD_OFFSET(CBitVec<64>, m_isSteadyState, 0)
126-
SCHEMA_FIELD_OFFSET(float, m_lastNetworkChange, 0)
127-
SCHEMA_FIELD_POINTER_OFFSET(CNetworkTransmitComponent, m_NetworkTransmitComponent, 0)
128-
SCHEMA_FIELD_OFFSET(int, m_iHealth, 0)
129-
SCHEMA_FIELD_OFFSET(int, m_iMaxHealth, 0)
130-
SCHEMA_FIELD_OFFSET(int, m_iTeamNum, 0)
131-
SCHEMA_FIELD_OFFSET(MoveType_t, m_MoveType, 0)
132-
SCHEMA_FIELD_OFFSET(uint32, m_spawnflags, 0)
133-
SCHEMA_FIELD_OFFSET(uint32, m_fFlags, 0)
134-
SCHEMA_FIELD_OFFSET(LifeState_t, m_lifeState, 0)
135-
SCHEMA_FIELD_OFFSET(CCollisionProperty *, m_pCollision, 0)
136-
SCHEMA_FIELD_OFFSET(CBodyComponent *, m_CBodyComponent, 0)
137-
SCHEMA_FIELD_OFFSET(Vector, m_vecAbsVelocity, 0)
138-
SCHEMA_FIELD_POINTER_OFFSET(CUtlStringToken, m_nSubclassID, 0)
139-
SCHEMA_FIELD_OFFSET(CUtlSymbolLarge, m_iGlobalname, 0)
140-
SCHEMA_FIELD_OFFSET(float, m_flGravityScale, 0)
122+
DECLARE_SCHEMA_CLASS_BASE(CBaseEntity, false)
123+
124+
SCHEMA_FIELD_OFFSET(CBitVec<64>, m_isSteadyState, 0);
125+
SCHEMA_FIELD_OFFSET(float, m_lastNetworkChange, 0);
126+
SCHEMA_FIELD_POINTER_OFFSET(CNetworkTransmitComponent, m_NetworkTransmitComponent, 0);
127+
SCHEMA_FIELD_OFFSET(int, m_iHealth, 0);
128+
SCHEMA_FIELD_OFFSET(int, m_iMaxHealth, 0);
129+
SCHEMA_FIELD_OFFSET(int, m_iTeamNum, 0);
130+
SCHEMA_FIELD_OFFSET(MoveType_t, m_MoveType, 0);
131+
SCHEMA_FIELD_OFFSET(uint32, m_spawnflags, 0);
132+
SCHEMA_FIELD_OFFSET(uint32, m_fFlags, 0);
133+
SCHEMA_FIELD_OFFSET(LifeState_t, m_lifeState, 0);
134+
SCHEMA_FIELD_OFFSET(CCollisionProperty*, m_pCollision, 0);
135+
SCHEMA_FIELD_OFFSET(CBodyComponent*, m_CBodyComponent, 0);
136+
SCHEMA_FIELD_OFFSET(Vector, m_vecAbsVelocity, 0);
137+
SCHEMA_FIELD_POINTER_OFFSET(CUtlStringToken, m_nSubclassID, 0);
138+
SCHEMA_FIELD_OFFSET(CUtlSymbolLarge, m_iGlobalname, 0);
139+
SCHEMA_FIELD_OFFSET(float, m_flGravityScale, 0);
141140

142141
int EntityIndex() { return this->m_pEntity->GetRefEHandle().GetEntryIndex(); }
143142

144-
void Teleport(Vector *position, QAngle *angles, Vector *velocity)
143+
void Teleport(Vector* position, QAngle* angles, Vector* velocity)
145144
{
146145
static int offset = g_Offsets->GetOffset("CBaseEntity_Teleport");
147146
CALL_VIRTUAL(void, offset, this, position, angles, velocity);
@@ -152,7 +151,7 @@ class Z_CBaseEntity : public CEntityInstance
152151
this->m_iHealth = this->m_iHealth() - damage;
153152
}
154153

155-
void Spawn()
154+
void DispatchSpawn()
156155
{
157156
g_Signatures->FetchSignature<CBaseEntity_DispatchSpawn>("CBaseEntity_DispatchSpawn")(this, nullptr);
158157
}
@@ -162,7 +161,7 @@ class Z_CBaseEntity : public CEntityInstance
162161
g_Signatures->FetchSignature<UTIL_Remove>("UTIL_Remove")(this);
163162
}
164163

165-
void AcceptInput(const char *pInputName, CEntityInstance *pActivator = nullptr, CEntityInstance *pCaller = nullptr, const char *value = nullptr, int outputID = 0)
164+
void AcceptInput(const char* pInputName, CEntityInstance* pActivator = nullptr, CEntityInstance* pCaller = nullptr, const char* value = nullptr, int outputID = 0)
166165
{
167166
variant_t variantValue = variant_t(value);
168167
g_Signatures->FetchSignature<CEntityInstance_AcceptInput>("CEntityInstance_AcceptInput")(this, pInputName, pActivator, pCaller, &variantValue, outputID);
@@ -173,7 +172,7 @@ class Z_CBaseEntity : public CEntityInstance
173172
g_Signatures->FetchSignature<CBaseEntity_EmitSoundParams>("CBaseEntity_EmitSoundParams")(this, sound_name.c_str(), pitch, volume, delay);
174173
}
175174

176-
void EmitSoundFilter(IRecipientFilter &filter, std::string sound_name, int pitch, float volume)
175+
void EmitSoundFilter(IRecipientFilter& filter, std::string sound_name, int pitch, float volume)
177176
{
178177
EmitSound_t params;
179178
params.m_pSoundName = sound_name.c_str();
@@ -183,5 +182,5 @@ class Z_CBaseEntity : public CEntityInstance
183182
g_Signatures->FetchSignature<CBaseEntity_EmitSoundFilter>("CBaseEntity_EmitSoundFilter")(filter, m_pEntity->m_EHandle.GetEntryIndex(), params);
184183
}
185184

186-
CEntitySubclassVDataBase *GetVData() { return *(CEntitySubclassVDataBase **)((uint8 *)(m_nSubclassID()) + 4); }
185+
CEntitySubclassVDataBase* GetVData() { return *(CEntitySubclassVDataBase**)((uint8*)(m_nSubclassID()) + 4); }
187186
};

src/sdk/entity/CBaseModelEntity.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ class CBaseModelEntity;
99

1010
typedef void (*CBaseModelEntity_SetModel)(CBaseModelEntity*, const char*);
1111

12-
class CBaseModelEntity : public Z_CBaseEntity
12+
class CBaseModelEntity : public CBaseEntity
1313
{
1414
public:
1515
DECLARE_SCHEMA_CLASS_BASE(CBaseModelEntity, false)
1616

17-
SCHEMA_FIELD_POINTER_OFFSET(CCollisionProperty, m_Collision, 0)
18-
SCHEMA_FIELD_OFFSET(CGlowProperty, m_Glow, 0)
19-
SCHEMA_FIELD_OFFSET(Color, m_clrRender, 0)
17+
SCHEMA_FIELD_POINTER_OFFSET(CCollisionProperty, m_Collision, 0);
18+
SCHEMA_FIELD_OFFSET(CGlowProperty, m_Glow, 0);
19+
SCHEMA_FIELD_OFFSET(Color, m_clrRender, 0);
2020

2121
void SetModel(const char* model)
2222
{

src/sdk/entity/CBasePlayerController.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ enum class CPlayerConnectedState : uint32_t
1717

1818
class CBasePlayerController;
1919

20-
typedef void (*ClientPrint)(CBasePlayerController *, int, const char *, const char *, const char *, const char *, const char *);
20+
typedef void (*ClientPrint)(CBasePlayerController*, int, const char*, const char*, const char*, const char*, const char*);
2121

22-
class CBasePlayerController : public Z_CBaseEntity
22+
class CBasePlayerController : public CBaseEntity
2323
{
2424
public:
2525
DECLARE_SCHEMA_CLASS_BASE(CBasePlayerController, false)
2626

27-
SCHEMA_FIELD_OFFSET(uint64, m_steamID, 0)
28-
SCHEMA_FIELD_OFFSET(CHandle<CBasePlayerPawn>, m_hPawn, 0)
29-
SCHEMA_FIELD_POINTER_OFFSET(char, m_iszPlayerName, 0)
30-
SCHEMA_FIELD_OFFSET(CPlayerConnectedState, m_iConnected, 0)
31-
SCHEMA_FIELD_OFFSET(uint32_t, m_iDesiredFOV, 0)
32-
SCHEMA_FIELD_OFFSET(bool, m_bIsHLTV, 0)
27+
SCHEMA_FIELD_OFFSET(uint64, m_steamID, 0);
28+
SCHEMA_FIELD_OFFSET(CHandle<CBasePlayerPawn>, m_hPawn, 0);
29+
SCHEMA_FIELD_POINTER_OFFSET(char, m_iszPlayerName, 0);
30+
SCHEMA_FIELD_OFFSET(CPlayerConnectedState, m_iConnected, 0);
31+
SCHEMA_FIELD_OFFSET(uint32_t, m_iDesiredFOV, 0);
32+
SCHEMA_FIELD_OFFSET(bool, m_bIsHLTV, 0);
3333

34-
void SendMsg(int destination, const char *message)
34+
void SendMsg(int destination, const char* message)
3535
{
3636
g_Signatures->FetchSignature<ClientPrint>("ClientPrint")(this, destination, message, nullptr, nullptr, nullptr, nullptr);
3737
}
3838

39-
void SetPawn(CCSPlayerPawn *pawn)
39+
void SetPawn(CCSPlayerPawn* pawn)
4040
{
4141
g_Signatures->FetchSignature<CBasePlayerController_SetPawn>("CBasePlayerController_SetPawn")(this, pawn, true, false);
4242
}

0 commit comments

Comments
 (0)