Skip to content

Commit 7a9b752

Browse files
PoggicekPoggicek
committed
Update SDK
1 parent 5639e7c commit 7a9b752

9 files changed

Lines changed: 39 additions & 40 deletions

File tree

‎src/cs2_sdk/entity/cbaseentity.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
#include "ehandle.h"
2424

2525

26-
class Z_CBaseEntity : public CBaseEntity
26+
class Z_CBaseEntity : public CEntityInstance
2727
{
2828
public:
29-
// This is a unique case as CBaseEntity is already defined in the sdk
3029
typedef Z_CBaseEntity ThisClass;
3130
static constexpr const char *ThisClassName = "CBaseEntity";
3231
static constexpr bool IsStruct = false;

‎src/cs2_sdk/serversideclient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "utlstring.h"
66
#include "inetchannel.h"
77

8-
class INetworkMessageProcessingPreFilter
8+
class INetworkMessageProcessingPreFilterCustom
99
{
1010
public:
1111
virtual void FilterMessage() = 0;

‎src/extension.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
CS2ServerGUI g_CS2ServerGUI;
5252
std::thread g_thread;
5353

54-
typedef bool (*FilterMessage_t)(INetworkMessageProcessingPreFilter* player, INetworkSerializable* pEvent, void* pData, void* pNetChan);
54+
typedef bool (*FilterMessage_t)(INetworkMessageProcessingPreFilterCustom* player, INetworkMessageInternal* pEvent, void* pData, void* pNetChan);
5555
FilterMessage_t g_pFilterMessage = nullptr;
5656
funchook_t* g_pHook = nullptr;
5757

5858
SH_DECL_HOOK8_void(IGameEventSystem, PostEventAbstract, SH_NOATTRIB, 0, CSplitScreenSlot, bool, int, const uint64*,
59-
INetworkSerializable*, const void*, unsigned long, NetChannelBufType_t);
59+
INetworkMessageInternal*, const CNetMessage*, unsigned long, NetChannelBufType_t);
6060

6161
CGameEntitySystem* GameEntitySystem()
6262
{
@@ -128,7 +128,7 @@ bool ReadPBFromBuffer(bf_read& buffer, T& pb)
128128
return true;
129129
}
130130

131-
bool Detour_FilterMessage(INetworkMessageProcessingPreFilter* player, INetworkSerializable* pEvent, void* pData, void* pNetChan)
131+
bool Detour_FilterMessage(INetworkMessageProcessingPreFilterCustom* player, INetworkMessageInternal* pEvent, void* pData, void* pNetChan)
132132
{
133133
if(!GUI::g_GUICtx.m_WindowStates.m_bEventLogger)
134134
return g_pFilterMessage(player, pEvent, pData, pNetChan);
@@ -200,7 +200,7 @@ bool CS2ServerGUI::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen,
200200
GET_V_IFACE_ANY(GetServerFactory, Interfaces::gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
201201
GET_V_IFACE_ANY(GetEngineFactory, g_pNetworkServerService, INetworkServerService, NETWORKSERVERSERVICE_INTERFACE_VERSION);
202202
GET_V_IFACE_ANY(GetEngineFactory, Interfaces::g_pSchemaSystem2, CSchemaSystem, SCHEMASYSTEM_INTERFACE_VERSION);
203-
GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceServiceServer, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
203+
GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceService, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
204204
GET_V_IFACE_CURRENT(GetEngineFactory, Interfaces::networkStringTableContainerServer, INetworkStringTableContainer, SOURCE2ENGINETOSERVERSTRINGTABLE_INTERFACE_VERSION);
205205
GET_V_IFACE_ANY(GetEngineFactory, Interfaces::gameEventSystem, IGameEventSystem, GAMEEVENTSYSTEM_INTERFACE_VERSION);
206206
GET_V_IFACE_ANY(GetEngineFactory, Interfaces::networkMessages, INetworkMessages, NETWORKMESSAGES_INTERFACE_VERSION);
@@ -220,7 +220,7 @@ bool CS2ServerGUI::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen,
220220
}
221221

222222
void CS2ServerGUI::Hook_PostEvent(CSplitScreenSlot nSlot, bool bLocalOnly, int nClientCount, const uint64* clients,
223-
INetworkSerializable* pEvent, const void* pData, unsigned long nSize, NetChannelBufType_t bufType)
223+
INetworkMessageInternal* pEvent, const CNetMessage* pData, unsigned long nSize, NetChannelBufType_t bufType)
224224
{
225225
if (!GUI::g_GUICtx.m_WindowStates.m_bEventLogger)
226226
return;

‎src/extension.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class CS2ServerGUI : public ISmmPlugin, public IMetamodListener
3636
void AllPluginsLoaded();
3737
public: //hooks
3838
void Hook_PostEvent(CSplitScreenSlot nSlot, bool bLocalOnly, int nClientCount, const uint64* clients,
39-
INetworkSerializable* pEvent, const void* pData, unsigned long nSize, NetChannelBufType_t bufType);
39+
INetworkMessageInternal* pEvent, const CNetMessage* pData, unsigned long nSize, NetChannelBufType_t bufType);
4040
void OnLevelInit( char const *pMapName,
4141
char const *pMapEntities,
4242
char const *pOldLevel,

‎src/imgui/panels/entitybrowser/entitybrowser.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void DumpEntitySchema(void* pSchemaField, CSchemaClassInfo* pSchema, std::unorde
157157

158158
void DumpFieldValue(const char* name, void* pSchemaField, CSchemaType* pType, bool wasPtr, std::unordered_map<std::string, std::string>& overrideMap)
159159
{
160-
if (pType->m_eTypeCategory == SCHEMA_TYPE_PTR)
160+
if (pType->m_eTypeCategory == SCHEMA_TYPE_POINTER)
161161
{
162162
auto ptrType = static_cast<CSchemaType_Ptr*>(pType);
163163
DumpFieldValue(name, *static_cast<void**>(pSchemaField), ptrType->m_pObjectType, true, overrideMap);
@@ -205,12 +205,12 @@ void DumpFieldValue(const char* name, void* pSchemaField, CSchemaType* pType, bo
205205
else if (pType->m_eTypeCategory == SCHEMA_TYPE_ATOMIC && pType->m_eAtomicCategory == SCHEMA_ATOMIC_COLLECTION_OF_T)
206206
{
207207
auto atomicType = static_cast<CSchemaType_Atomic_CollectionOfT*>(pType);
208-
size_t count = (int)atomicType->m_pfnManipulator(SCHEMA_ATOMIC_MANIPULATOR_ACTION_GET_COUNT, pSchemaField, 0, 0);
208+
size_t count = (int)atomicType->m_pfnManipulator(SCHEMA_COLLECTION_MANIPULATOR_ACTION_GET_COUNT, pSchemaField, 0, 0);
209209

210210
for (int i = 0; i < count; i++)
211211
{
212212
auto fieldName = std::format("[{}]", i);
213-
DumpFieldValue(fieldName.c_str(), (void*)atomicType->m_pfnManipulator(SCHEMA_ATOMIC_MANIPULATOR_ACTION_GET_ELEMENT_CONST, pSchemaField, (void*)i, 0), atomicType->m_pTemplateType, false, overrideMap);
213+
DumpFieldValue(fieldName.c_str(), (void*)atomicType->m_pfnManipulator(SCHEMA_COLLECTION_MANIPULATOR_ACTION_GET_ELEMENT_CONST, pSchemaField, (void*)i, 0), atomicType->m_pTemplateType, false, overrideMap);
214214
}
215215
ImGui::TreePop();
216216
}

‎src/imgui/panels/entitybrowser/type_stringifier.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,29 @@ std::string DumpBuiltinValue(void* value, CSchemaType_Builtin* pType)
3535
{
3636
switch (pType->m_eBuiltinType)
3737
{
38-
case SCHEMA_BUILTIN_BOOL:
38+
case SCHEMA_BUILTIN_TYPE_BOOL:
3939
return *(bool*)value ? "true" : "false";
40-
case SCHEMA_BUILTIN_CHAR:
40+
case SCHEMA_BUILTIN_TYPE_CHAR:
4141
return std::to_string(*(char*)value);
42-
case SCHEMA_BUILTIN_INT8:
42+
case SCHEMA_BUILTIN_TYPE_INT8:
4343
return std::to_string(*(int8*)value);
44-
case SCHEMA_BUILTIN_UINT8:
44+
case SCHEMA_BUILTIN_TYPE_UINT8:
4545
return std::to_string(*(uint8*)value);
46-
case SCHEMA_BUILTIN_INT16:
46+
case SCHEMA_BUILTIN_TYPE_INT16:
4747
return std::to_string(*(int16*)value);
48-
case SCHEMA_BUILTIN_UINT16:
48+
case SCHEMA_BUILTIN_TYPE_UINT16:
4949
return std::to_string(*(uint16*)value);
50-
case SCHEMA_BUILTIN_INT32:
50+
case SCHEMA_BUILTIN_TYPE_INT32:
5151
return std::to_string(*(int32*)value);
52-
case SCHEMA_BUILTIN_UINT32:
52+
case SCHEMA_BUILTIN_TYPE_UINT32:
5353
return std::to_string(*(uint32*)value);
54-
case SCHEMA_BUILTIN_INT64:
54+
case SCHEMA_BUILTIN_TYPE_INT64:
5555
return std::to_string(*(int64*)value);
56-
case SCHEMA_BUILTIN_UINT64:
56+
case SCHEMA_BUILTIN_TYPE_UINT64:
5757
return std::to_string(*(uint64*)value);
58-
case SCHEMA_BUILTIN_FLOAT32:
58+
case SCHEMA_BUILTIN_TYPE_FLOAT32:
5959
return std::to_string(*(float*)value);
60-
case SCHEMA_BUILTIN_FLOAT64:
60+
case SCHEMA_BUILTIN_TYPE_FLOAT64:
6161
return std::to_string(*(double*)value);
6262
default:
6363
return "? (Builtin)";
@@ -69,52 +69,52 @@ void DumpAtomicBasicValue(void* value, CSchemaType_Atomic* pType, const char* fi
6969
if (!pType->m_pAtomicInfo)
7070
return ImGui::Text("? (Atomic null info)");
7171

72-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "Vector"))
72+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "Vector"))
7373
{
7474
auto& vector = *static_cast<Vector*>(value);
7575
ImGui::Text("%f %f %f", vector.x, vector.y, vector.z);
7676
return;
7777
}
7878

79-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "Vector2D"))
79+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "Vector2D"))
8080
{
8181
auto& vector = *static_cast<Vector2D*>(value);
8282
ImGui::Text("%f %f", vector.x, vector.y);
8383
return;
8484
}
8585

86-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "QAngle"))
86+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "QAngle"))
8787
{
8888
auto& qangle = *static_cast<QAngle*>(value);
8989
ImGui::Text("%f %f %f", qangle.x, qangle.y, qangle.z);
9090
return;
9191
}
9292

93-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "Color"))
93+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "Color"))
9494
{
9595
auto& color = *static_cast<Color*>(value);
9696
auto imColor = ImVec4(color.r() / 255.0f, color.g() / 255.0f, color.b() / 255.0f, color.a() / 255.0f);
9797
ImGui::ColorEdit4("color", (float*)&imColor, ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_InputRGB);
9898
return;
9999
}
100100

101-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CUtlSymbolLarge"))
101+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CUtlSymbolLarge"))
102102
{
103103
auto& symbolLarge = *static_cast<CUtlSymbolLarge*>(value);
104104
ImGui::Text("\"%s\"", symbolLarge.String());
105105

106106
return;
107107
}
108108

109-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CUtlString"))
109+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CUtlString"))
110110
{
111111
auto& string = *static_cast<CUtlString*>(value);
112112
ImGui::Text("\"%s\"", string.Get());
113113

114114
return;
115115
}
116116

117-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CEntityIndex"))
117+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CEntityIndex"))
118118
{
119119
auto& index = *static_cast<CEntityIndex*>(value);
120120
auto entity = GameEntitySystem()->GetEntityInstance(index);
@@ -129,7 +129,7 @@ void DumpAtomicBasicValue(void* value, CSchemaType_Atomic* pType, const char* fi
129129
return;
130130
}
131131

132-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CEntityHandle"))
132+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CEntityHandle"))
133133
{
134134
auto& handle = *static_cast<CEntityHandle*>(value);
135135
if (auto entity = handle.Get())
@@ -143,7 +143,7 @@ void DumpAtomicBasicValue(void* value, CSchemaType_Atomic* pType, const char* fi
143143
return;
144144
}
145145

146-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CNetworkedQuantizedFloat"))
146+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CNetworkedQuantizedFloat"))
147147
{
148148
ImGui::Text("%f", *static_cast<float*>(value));
149149
return;
@@ -157,7 +157,7 @@ void DumpAtomicTValue(void* value, CSchemaType_Atomic_T* pType, const char* fiel
157157
if (!pType->m_pAtomicInfo)
158158
return ImGui::Text("? (AtomicT null info)");
159159

160-
if (!strcmp(pType->m_pAtomicInfo->m_pszName1, "CHandle"))
160+
if (!strcmp(pType->m_pAtomicInfo->m_pszName, "CHandle"))
161161
{
162162
auto& handle = *static_cast<CEntityHandle*>(value);
163163
if (auto entity = handle.Get())
@@ -183,14 +183,14 @@ void DumpStringValue(void* ptr, CSchemaType* pType, bool* isNested, const char*
183183
{
184184
auto fixedArrayType = static_cast<CSchemaType_FixedArray*>(pType);
185185
if (fixedArrayType->m_pElementType->m_eTypeCategory == SCHEMA_TYPE_BUILTIN)
186-
if (static_cast<CSchemaType_Builtin*>(fixedArrayType->m_pElementType)->m_eBuiltinType == SCHEMA_BUILTIN_CHAR)
186+
if (static_cast<CSchemaType_Builtin*>(fixedArrayType->m_pElementType)->m_eBuiltinType == SCHEMA_BUILTIN_TYPE_CHAR)
187187
return ImGui::Text("\"%s\"", (char*)ptr);
188188

189189
*isNested = true;
190190
}
191191
else if (pType->m_eTypeCategory == SCHEMA_TYPE_ATOMIC)
192192
{
193-
if (pType->m_eAtomicCategory == SCHEMA_ATOMIC_BASIC)
193+
if (pType->m_eAtomicCategory == SCHEMA_ATOMIC_PLAIN)
194194
return DumpAtomicBasicValue(ptr, static_cast<CSchemaType_Atomic*>(pType), fieldName);
195195
else if (pType->m_eAtomicCategory == SCHEMA_ATOMIC_T)
196196
{

‎src/imgui/panels/eventlogger/eventlogger.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void AddEventLog(std::string&& name, std::string&& data, bool ingress, std::stri
5050
std::lock_guard<std::mutex> lock(eventLogLock);
5151
vecEventLogs[globalId++] = { std::move(name), std::move(data),senderName, ingress };
5252

53-
if(vecEventLogs.size() > 500)
53+
if(vecEventLogs.size() > 5000)
5454
vecEventLogs.erase(vecEventLogs.begin());
5555
}
5656

‎src/imgui/panels/playerlist/playerlist.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void Draw(bool* isOpen)
7373

7474
for (int i = 1; i <= gpGlobals->maxClients; i++)
7575
{
76-
auto controller = static_cast<CBasePlayerController*>(GameEntitySystem()->GetBaseEntity(CEntityIndex(i)));
76+
auto controller = static_cast<CBasePlayerController*>(GameEntitySystem()->GetEntityInstance(CEntityIndex(i)));
7777

7878
if (!controller)
7979
continue;

‎xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ add_requires("imgui-file-dialog", {debug = is_mode("debug")})
88

99
includes("@builtin/xpack")
1010

11-
--local SDK_PATH = os.getenv("HL2SDKCS2")
12-
local SDK_PATH = "G:/hl2sdk-experimental/hl2sdk"
11+
local SDK_PATH = os.getenv("HL2SDKCS2")
12+
--local SDK_PATH = "G:/hl2sdk-experimental/hl2sdk"
1313
local MM_PATH = os.getenv("MMSOURCE112")
1414

1515
target("CS2ServerGUI")

0 commit comments

Comments
 (0)