Update schema system

Author: Vauff

AMBuildScript

@@ -157,7 +157,7 @@ class MMSPluginConfig(object):
         '-fPIC',
       ]
 
-      cxx.cxxflags += ['-std=c++17']
+      cxx.cxxflags += ['-std=c++20']
       if (cxx.version >= 'gcc-4.0') or cxx.family == 'clang':
         cxx.cflags += ['-fvisibility=hidden']
         cxx.cxxflags += ['-fvisibility-inlines-hidden']
@@ -204,7 +204,7 @@ class MMSPluginConfig(object):
       cxx.cflags += [
         '/W3',
         '/Zi',
-        '/std:c++17',
+        '/std:c++20',
       ]
       cxx.cxxflags += ['/TP']
 

configure.py

@@ -25,7 +25,7 @@
                        help='Plugin alias')
 parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
                        help='Root search folder for HL2SDKs')
-parser.options.add_argument('--hl2sdk-manifests', type=str, dest='hl2sdk_manifests', default=None,
+parser.options.add_argument('--hl2sdk-manifests', type=str, dest='hl2sdk_manifests', default='hl2sdk-manifests/',
                        help='HL2SDK manifests source tree folder')
 parser.options.add_argument('--mms_path', type=str, dest='mms_path', default=None,
                        help='Metamod:Source source tree folder')

cs2_sdk/schema.cpp

@@ -1,7 +1,7 @@
 /**
  * =============================================================================
  * CS2Fixes
- * Copyright (C) 2023 Source2ZE
+ * Copyright (C) 2023-2025 Source2ZE
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -19,116 +19,113 @@
 
 #include "schema.h"
 
-#include "schemasystem/schemasystem.h"
-#include "tier1/utlmap.h"
-#include "tier0/memdbgon.h"
-#include "../utils/plat.h"
 #include "entity/cbaseentity.h"
+#include "../utils/plat.h"
+#include "schemasystem/schemasystem.h"
 
-extern CSchemaSystem *g_pSchemaSystem2;
-extern CGlobalVars *gpGlobals;
-
-using SchemaKeyValueMap_t = CUtlMap<uint32_t, SchemaKey>;
-using SchemaTableMap_t = CUtlMap<uint32_t, SchemaKeyValueMap_t*>;
+#include "tier0/memdbgon.h"
 
+using SchemaKeyValueMap_t = std::map<uint32_t, SchemaKey>;
+using SchemaTableMap_t = std::map<uint32_t, SchemaKeyValueMap_t>;
 
 static bool IsFieldNetworked(SchemaClassFieldData_t& field)
 {
-    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_pStaticMetadata[i].m_pszName))
-            return true;
-    }
-
-    return false;
-}   
+	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_pStaticMetadata[i].m_pszName))
+			return true;
+	}
+
+	return false;
+}
 
-static bool InitSchemaFieldsForClass(SchemaTableMap_t *tableMap, const char* className, uint32_t classKey)
+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;
+	if (!pType)
+		return false;
 
-    SchemaClassInfoData_t *pClassInfo = pType->FindDeclaredClass(className).Get();
+	SchemaClassInfoData_t* pClassInfo = pType->FindDeclaredClass(className).Get();
 
-    if (!pClassInfo)
-    {
-        SchemaKeyValueMap_t *map = new SchemaKeyValueMap_t(0, 0, DefLessFunc(uint32_t));
-        tableMap->Insert(classKey, map);
+	if (!pClassInfo)
+	{
+		SchemaKeyValueMap_t map;
+		tableMap.insert(std::make_pair(classKey, map));
 
-        Warning("InitSchemaFieldsForClass(): '%s' was not found!\n", className);
-        return false;
-    }
+		Warning("InitSchemaFieldsForClass(): '%s' was not found!\n", className);
+		return false;
+	}
 
-    short fieldsSize = pClassInfo->m_nFieldCount;
-    SchemaClassFieldData_t* pFields = pClassInfo->m_pFields;
+	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);
-    tableMap->Insert(classKey, keyValueMap);
+	SchemaKeyValueMap_t &keyValueMap = tableMap.insert(std::make_pair(classKey, SchemaKeyValueMap_t())).first->second;
 
-    for (int i = 0; i < fieldsSize; ++i)
-    {
-        SchemaClassFieldData_t& field = pFields[i];
+	for (int i = 0; i < fieldsSize; ++i)
+	{
+		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_pszName), {field.m_nSingleInheritanceOffset, IsFieldNetworked(field)});
-    }
+		std::pair<uint32_t, SchemaKey> keyValuePair;
+		keyValuePair.first = hash_32_fnv1a_const(field.m_pszName);
+		keyValuePair.second.offset = field.m_nSingleInheritanceOffset;
+		keyValuePair.second.networked = IsFieldNetworked(field);
+
+		keyValueMap.insert(keyValuePair);
+	}
 
-    return true;
+	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;
+	if (!pType)
+		return false;
 
-    SchemaClassInfoData_t* pClassInfo = pType->FindDeclaredClass(className).Get();
+	SchemaClassInfoData_t* pClassInfo = pType->FindDeclaredClass(className).Get();
 
-    do
-    {
-        SchemaClassFieldData_t* pFields = pClassInfo->m_pFields;
-        short fieldsSize = pClassInfo->m_nFieldCount;
-        for (int i = 0; i < fieldsSize; ++i)
-        {
-            SchemaClassFieldData_t& field = pFields[i];
+	do
+	{
+		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_pszName, "__m_pChainEntity") == 0)
-            {
-                return field.m_nSingleInheritanceOffset;
-            }
-        }
-    } while ((pClassInfo = pClassInfo->m_pBaseClasses ? pClassInfo->m_pBaseClasses->m_pClass : nullptr) != nullptr);
+			if (V_strcmp(field.m_pszName, "__m_pChainEntity") == 0)
+				return field.m_nSingleInheritanceOffset;
+		}
+	} while ((pClassInfo = pClassInfo->m_pBaseClasses ? pClassInfo->m_pBaseClasses->m_pClass : nullptr) != nullptr);
 
-    return 0;
+	return 0;
 }
 
 SchemaKey schema::GetOffset(const char* className, uint32_t classKey, const char* memberName, uint32_t memberKey)
 {
-	static SchemaTableMap_t schemaTableMap(0, 0, DefLessFunc(uint32_t));
-	int16_t tableMapIndex = schemaTableMap.Find(classKey);
-    if (!schemaTableMap.IsValidIndex(tableMapIndex))
-    {
-        if (InitSchemaFieldsForClass(&schemaTableMap, className, classKey))
-            return GetOffset(className, classKey, memberName, memberKey);
-
-        return { 0, 0 };
-    }
-
-    SchemaKeyValueMap_t *tableMap = schemaTableMap[tableMapIndex];
-	int16_t memberIndex = tableMap->Find(memberKey);
-    if (!tableMap->IsValidIndex(memberIndex))
-    {
-        Warning("schema::GetOffset(): '%s' was not found in '%s'!\n", memberName, className);
-        return { 0, 0 };
-    }
-
-    return tableMap->Element(memberIndex);
+	static SchemaTableMap_t schemaTableMap;
+
+	if (!schemaTableMap.contains(classKey))
+	{
+		if (InitSchemaFieldsForClass(schemaTableMap, className, classKey))
+			return GetOffset(className, classKey, memberName, memberKey);
+
+		return {0, 0};
+	}
+
+	SchemaKeyValueMap_t tableMap = schemaTableMap[classKey];
+
+	if (!tableMap.contains(memberKey))
+	{
+		Warning("schema::GetOffset(): '%s' was not found in '%s'!\n", memberName, className);
+		return {0, 0};
+	}
+
+	return tableMap[memberKey];
 }

hl2sdk-manifests

@@ -47,7 +47,6 @@ CSteamGameServerAPIContext g_steamAPI;
 IServerGameDLL* server = NULL;
 IVEngineServer* engine = NULL;
 IServerGameClients* gameclients = NULL;
-CSchemaSystem* g_pSchemaSystem2 = nullptr;
 CGameEntitySystem* g_pEntitySystem = nullptr;
 
 CGameEntitySystem* GameEntitySystem()
@@ -71,7 +70,7 @@ bool ServerListPlayersFix::Load(PluginId id, ISmmAPI *ismm, char *error, size_t
 	GET_V_IFACE_ANY(GetServerFactory, server, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
 	GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
 	GET_V_IFACE_ANY(GetServerFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
-	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(GetEngineFactory, g_pNetworkServerService, INetworkServerService, NETWORKSERVERSERVICE_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetEngineFactory, g_pGameResourceServiceServer, IGameResourceService, GAMERESOURCESERVICESERVER_INTERFACE_VERSION);
 
@@ -173,7 +172,7 @@ const char *ServerListPlayersFix::GetLicense()
 
 const char *ServerListPlayersFix::GetVersion()
 {
-	return "1.0.1";
+	return "1.0.2";
 }
 
 const char *ServerListPlayersFix::GetDate()