Update sdk and update crash

Author: marqdevx

sdk

@@ -1,7 +1,7 @@
 /**
  * =============================================================================
  * CS2Fixes
- * Copyright (C) 2023 Source2ZE
+ * Copyright (C) 2023-2024 Source2ZE
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -20,13 +20,12 @@
 #include "schema.h"
 
 #include "../common.h"
-#include "cschemasystem.h"
+#include "schemasystem/schemasystem.h"
 #include "tier1/utlmap.h"
 #include "tier0/memdbgon.h"
 #include "plat.h"
 #include "entity/cbaseentity.h"
 
-extern CSchemaSystem *g_pSchemaSystem2;
 extern CGlobalVars *gpGlobals;
 
 using SchemaKeyValueMap_t = CUtlMap<uint32_t, SchemaKey>;
@@ -35,10 +34,10 @@ using SchemaTableMap_t = CUtlMap<uint32_t, SchemaKeyValueMap_t*>;
 
 static bool IsFieldNetworked(SchemaClassFieldData_t& field)
 {
-    for (int i = 0; i < field.m_metadata_size; i++)
+    for (int i = 0; i < field.m_nStaticMetadataCount; i++)
     {
         static auto networkEnabled = hash_32_fnv1a_const("MNetworkEnable");
-        if (networkEnabled == hash_32_fnv1a_const(field.m_metadata[i].m_name))
+        if (networkEnabled == hash_32_fnv1a_const(field.m_pStaticMetadata[i].m_pszName))
             return true;
     }
 
@@ -47,12 +46,12 @@ static bool IsFieldNetworked(SchemaClassFieldData_t& field)
 
 static bool InitSchemaFieldsForClass(SchemaTableMap_t *tableMap, const char* className, uint32_t classKey)
 {
-    CSchemaSystemTypeScope* pType = g_pSchemaSystem2->FindTypeScopeForModule(MODULE_PREFIX "server" MODULE_EXT);
+    CSchemaSystemTypeScope* pType = g_pSchemaSystem->FindTypeScopeForModule(MODULE_PREFIX "server" MODULE_EXT);
 
     if (!pType)
         return false;
 
-    SchemaClassInfoData_t *pClassInfo = pType->FindDeclaredClass(className);
+    SchemaClassInfoData_t *pClassInfo = pType->FindDeclaredClass(className).Get();
 
     if (!pClassInfo)
     {
@@ -63,8 +62,8 @@ static bool InitSchemaFieldsForClass(SchemaTableMap_t *tableMap, const char* cla
         return false;
     }
 
-    short fieldsSize = pClassInfo->GetFieldsSize();
-    SchemaClassFieldData_t* pFields = pClassInfo->GetFields();
+    short fieldsSize = pClassInfo->m_nFieldCount;
+    SchemaClassFieldData_t* pFields = pClassInfo->m_pFields;
 
     SchemaKeyValueMap_t *keyValueMap = new SchemaKeyValueMap_t(0, 0, DefLessFunc(uint32_t));
     keyValueMap->EnsureCapacity(fieldsSize);
@@ -75,38 +74,38 @@ static bool InitSchemaFieldsForClass(SchemaTableMap_t *tableMap, const char* cla
         SchemaClassFieldData_t& field = pFields[i];
 
 #ifdef _DEBUG
-		Message("%s::%s found at -> 0x%X - %llx\n", className, field.m_name, field.m_single_inheritance_offset, &field);
+		Message("%s::%s found at -> 0x%X - %llx\n", className, field.m_pszName, field.m_nSingleInheritanceOffset, &field);
 #endif
 
-        keyValueMap->Insert(hash_32_fnv1a_const(field.m_name), {field.m_single_inheritance_offset, IsFieldNetworked(field)});
+        keyValueMap->Insert(hash_32_fnv1a_const(field.m_pszName), {field.m_nSingleInheritanceOffset, IsFieldNetworked(field)});
     }
 
     return true;
 }
 
 int16_t schema::FindChainOffset(const char* className)
 {
-    CSchemaSystemTypeScope* pType = g_pSchemaSystem2->FindTypeScopeForModule(MODULE_PREFIX "server" MODULE_EXT);
+    CSchemaSystemTypeScope* pType = g_pSchemaSystem->FindTypeScopeForModule(MODULE_PREFIX "server" MODULE_EXT);
 
     if (!pType)
         return false;
 
-    SchemaClassInfoData_t* pClassInfo = pType->FindDeclaredClass(className);
+    SchemaClassInfoData_t* pClassInfo = pType->FindDeclaredClass(className).Get();
 
     do
     {
-        SchemaClassFieldData_t* pFields = pClassInfo->GetFields();
-        short fieldsSize = pClassInfo->GetFieldsSize();
+        SchemaClassFieldData_t* pFields = pClassInfo->m_pFields;
+        short fieldsSize = pClassInfo->m_nFieldCount;
         for (int i = 0; i < fieldsSize; ++i)
         {
             SchemaClassFieldData_t& field = pFields[i];
 
-            if (V_strcmp(field.m_name, "__m_pChainEntity") == 0)
+            if (V_strcmp(field.m_pszName, "__m_pChainEntity") == 0)
             {
-                return field.m_single_inheritance_offset;
+                return field.m_nSingleInheritanceOffset;
             }
         }
-    } while ((pClassInfo = pClassInfo->GetParent()) != nullptr);
+    } while ((pClassInfo = pClassInfo->m_pBaseClasses ? pClassInfo->m_pBaseClasses->m_pClass : nullptr) != nullptr);
 
     return 0;
 }
@@ -140,4 +139,4 @@ void SetStateChanged(Z_CBaseEntity* pEntity, int offset)
 
     pEntity->m_lastNetworkChange = gpGlobals->curtime;
     pEntity->m_isSteadyState().ClearAll();
-};
+};

src/cs2_sdk/schema.cpp

@@ -1,7 +1,7 @@
 /**
  * =============================================================================
  * CS2Fixes
- * Copyright (C) 2023 Source2ZE
+ * Copyright (C) 2023-2024 Source2ZE
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "stdint.h"
-
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable : 4005)

src/cs2_sdk/schema.h

@@ -33,7 +33,7 @@
 #include "icvar.h"
 #include "interface.h"
 #include "tier0/dbg.h"
-#include "cschemasystem.h"
+#include "schemasystem/schemasystem.h"
 #include "plat.h"
 #include "entitysystem.h"
 #include "engine/igameeventsystem.h"
@@ -53,9 +53,6 @@
 #include "entity/ccsplayercontroller.h"
 #include "entitylistener.h"
 
-#define VPROF_ENABLED
-#include "tier0/vprof.h"
-
 #include "tier0/memdbgon.h"
 
 extern CUtlVector <CCSPlayerController*> coaches;
@@ -120,7 +117,6 @@ IGameEventManager2 *g_gameEventManager = nullptr;
 INetworkGameServer *g_pNetworkGameServer = nullptr;
 CGameEntitySystem *g_pEntitySystem = nullptr;
 CEntityListener *g_pEntityListener = nullptr;
-CSchemaSystem *g_pSchemaSystem2 = nullptr;
 CGlobalVars *gpGlobals = nullptr;
 CPlayerManager *g_playerManager = nullptr;
 IVEngineServer2 *g_pEngineServer2 = nullptr;
@@ -141,9 +137,9 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool
 	PLUGIN_SAVEVARS();
 
 	GET_V_IFACE_CURRENT(GetEngineFactory, g_pEngineServer2, IVEngineServer2, SOURCE2ENGINETOSERVER_INTERFACE_VERSION);
-	GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceServiceServer, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
+	GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceService, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, g_pCVar, ICvar, CVAR_INTERFACE_VERSION);
-	GET_V_IFACE_CURRENT(GetEngineFactory, g_pSchemaSystem2, CSchemaSystem, SCHEMASYSTEM_INTERFACE_VERSION);
+	GET_V_IFACE_CURRENT(GetEngineFactory, g_pSchemaSystem, ISchemaSystem, SCHEMASYSTEM_INTERFACE_VERSION);
 	GET_V_IFACE_ANY(GetServerFactory, g_pSource2Server, ISource2Server, SOURCE2SERVER_INTERFACE_VERSION);
 	GET_V_IFACE_ANY(GetServerFactory, g_pSource2ServerConfig, ISource2ServerConfig, SOURCE2SERVERCONFIG_INTERFACE_VERSION);
 	GET_V_IFACE_ANY(GetServerFactory, g_pSource2GameEntities, ISource2GameEntities, SOURCE2GAMEENTITIES_INTERFACE_VERSION);
@@ -404,7 +400,7 @@ void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISou
 
 	// Run map cfg (if present)
 	/*char cmd[MAX_PATH];
-	V_snprintf(cmd, sizeof(cmd), "exec cs2fixes/maps/%s", gpGlobals->mapname);
+	V_snprintf(cmd, sizeof(cmd), "exec cs2fixes/maps/%s", gpGlobals->mapname.ToCStr());
 	g_pEngineServer2->ServerCommand(cmd);
 	*/
 
@@ -536,7 +532,7 @@ void CS2Fixes::Hook_ClientDisconnect( CPlayerSlot slot, ENetworkDisconnectionRea
 
 void CS2Fixes::Hook_GameFrame( bool simulating, bool bFirstTick, bool bLastTick )
 {
-	VPROF_ENTER_SCOPE(__FUNCTION__);
+	
 	/**
 	 * simulating:
 	 * ***********
@@ -577,7 +573,6 @@ void CS2Fixes::Hook_GameFrame( bool simulating, bool bFirstTick, bool bLastTick
 		}
 	}
 
-	VPROF_EXIT_SCOPE();
 }
 
 // Potentially might not work

src/cs2fixes.cpp

@@ -38,9 +38,6 @@
 #include "gameconfig.h"
 
 
-#define VPROF_ENABLED
-#include "tier0/vprof.h"
-
 #include "tier0/memdbgon.h"
 
 extern CGlobalVars *gpGlobals;

src/detours.cpp

@@ -27,9 +27,6 @@
 #include "ctimer.h"
 #include "ctime"
 
-#define VPROF_ENABLED
-#include "tier0/vprof.h"
-
 #include "tier0/memdbgon.h"
 
 

src/playermanager.cpp

@@ -1,7 +1,7 @@
 /**
  * =============================================================================
  * CS2Fixes
- * Copyright (C) 2023 Source2ZE
+ * Copyright (C) 2023-2024 Source2ZE
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -19,35 +19,41 @@
 
 #pragma once
 #include "irecipientfilter.h"
+#include "playermanager.h"
 
+// Simple filter for when only 1 recipient is needed
 class CSingleRecipientFilter : public IRecipientFilter
 {
 public:
-	CSingleRecipientFilter(int iRecipient, bool bReliable = true, bool bInitMessage = false) :
-		m_iRecipient(iRecipient), m_bReliable(bReliable), m_bInitMessage(bInitMessage) {}
+	CSingleRecipientFilter(CPlayerSlot iRecipient, NetChannelBufType_t nBufType = BUF_RELIABLE, bool bInitMessage = false) :
+		m_iRecipient(iRecipient), m_nBufType(nBufType), m_bInitMessage(bInitMessage) {}
 
 	~CSingleRecipientFilter() override {}
 
-	bool IsReliable(void) const override { return m_bReliable; }
-
+	NetChannelBufType_t GetNetworkBufType(void) const override { return m_nBufType; }
 	bool IsInitMessage(void) const override { return m_bInitMessage; }
-
 	int GetRecipientCount(void) const override { return 1; }
-
-	CPlayerSlot GetRecipientIndex(int slot) const override { return CPlayerSlot(m_iRecipient); }
+	CPlayerSlot GetRecipientIndex(int slot) const override { return m_iRecipient; }
 
 private:
-	bool m_bReliable;
+	CPlayerSlot m_iRecipient;
+	NetChannelBufType_t m_nBufType;
 	bool m_bInitMessage;
-	int m_iRecipient;
 };
 
-class CCopyRecipientFilter : public IRecipientFilter
+
+class CRecipientFilter : public IRecipientFilter
 {
 public:
-	CCopyRecipientFilter(IRecipientFilter *source, int iExcept)
+	CRecipientFilter()
 	{
-		m_bReliable = source->IsReliable();
+		m_nBufType = BUF_RELIABLE;
+		m_bInitMessage = false;
+	}
+
+	CRecipientFilter(IRecipientFilter *source, int iExcept = -1)
+	{
+		m_nBufType = source->GetNetworkBufType();
 		m_bInitMessage = source->IsInitMessage();
 		m_Recipients.RemoveAll();
 
@@ -58,12 +64,10 @@ class CCopyRecipientFilter : public IRecipientFilter
 		}
 	}
 
-	~CCopyRecipientFilter() override {}
-
-	bool IsReliable(void) const override { return m_bReliable; }
+	~CRecipientFilter() override {}
 
+	NetChannelBufType_t GetNetworkBufType(void) const override { return m_nBufType; }
 	bool IsInitMessage(void) const override { return m_bInitMessage; }
-
 	int GetRecipientCount(void) const override { return m_Recipients.Count(); }
 
 	CPlayerSlot GetRecipientIndex(int slot) const override
@@ -74,8 +78,30 @@ class CCopyRecipientFilter : public IRecipientFilter
 		return m_Recipients[slot];
 	}
 
+	void AddAllPlayers(void)
+	{
+		m_Recipients.RemoveAll();
+
+		for (int i = 0; i < MAXPLAYERS; i++)
+		{
+			if (!g_playerManager->GetPlayer(i))
+				continue;
+
+			AddRecipient(i);
+		}
+	}
+
+	void AddRecipient(CPlayerSlot slot)
+	{
+		// Don't add if it already exists
+		if (m_Recipients.Find(slot) != m_Recipients.InvalidIndex())
+			return;
+
+		m_Recipients.AddToTail(slot);
+	}
+
 private:
-	bool m_bReliable;
+	NetChannelBufType_t m_nBufType;
 	bool m_bInitMessage;
-	CUtlVectorFixed<CPlayerSlot, 64> m_Recipients;
+	CUtlVectorFixed<CPlayerSlot, MAXPLAYERS> m_Recipients;
 };