make schema system works

Kxnrl · Kxnrl · commit 88128016ad1e · 2025-08-01T16:50:21.000+08:00
diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt
@@ -131,6 +131,13 @@
 				"windows" "\x48\x89\x5C\x24\x08\x57\x48\x83\xEC\x2A\xF3\x0F\x10\x81\x04\x04\x00\x00"
 				"linux" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x81\xEC\x2A\x2A\x2A\x2A\x0F\x2E\x87\x2A\x2A\x2A\x2A\x7A\x2A\x75\x2A\x48\x81\xC4\x2A\x2A\x2A\x2A\x5B\x41\x5C\x41\x5D\x41\x5E\x41\x5F\x5D\xC3\x0F\x1F\x40\x2A\x31\xC9\x31\xF6\x31\xFF\xF3\x0F\x11\x85\x2A\x2A\x2A\x2A\x66\x89\x8D\x2A\x2A\x2A\x2A\xBA\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\x66\x0F\xEF\xC9\x48\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x48\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x48\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x48\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x0F\x29\x8D\x2A\x2A\x2A\x2A\x48\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xC7\x85\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\xF3\x0F\x10\x85\x2A\x2A\x2A\x2A\x85\xC0\x41\x89\xC4\x0F\x8E\x2A\x2A\x2A\x2A\x48\x63\x8D\x2A\x2A\x2A\x2A\x48\x63\xD0\x31\xF6\xF3\x0F\x11\x85\x2A\x2A\x2A\x2A\x48\xC1\xE2\x2A\x48\x8B\xBD\x2A\x2A\x2A\x2A\x48\xC1\xE1\x2A\x81\xBD\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x40\x0F\x96\xC6\xE8\x2A\x2A\x2A\x2A\x8B\x95\x2A\x2A\x2A\x2A\xF3\x0F\x10\x85\x2A\x2A\x2A\x2A\x48\x89\x85\x2A\x2A\x2A\x2A\x81\xFA\x2A\x2A\x2A\x2A\x0F\x87"
 			}
+			"NetworkStateChanged"
+			{
+				"library"    "server"
+				"windows"    "\x4C\x8B\xC2\x48\x8B\xD1\x48\x8B\x09"
+				"linux"      "\x48\x8B\x07\x48\x85\xC0\x74\x2A\x48\x8B\x50\x10"
+			}
+			
 			// "Game System %s is defined twice!\n"
 			// Note that this signature points to the instruction with sm_pFirst which is the first qword referenced in the function.
 			"IGameSystem_InitAllSystems_pFirst"
@@ -394,6 +401,11 @@
 		}
 		"Offsets"
 		{
+			"CBaseEntity::StateChanged"
+			{
+				"windows"   "25"
+				"linux"     "26"
+			}
 			"CBaseEntity::Precache"
 			{
 				"windows"		"4"
diff --git a/src/addresses.cpp b/src/addresses.cpp
@@ -58,6 +58,7 @@ bool addresses::Initialize(CGameConfig* g_GameConfig)
 	RESOLVE_SIG(g_GameConfig, "CBasePlayerController_SetPawn", addresses::CBasePlayerController_SetPawn);
 	RESOLVE_SIG(g_GameConfig, "CBaseModelEntity_SetModel", addresses::CBaseModelEntity_SetModel);
 	RESOLVE_SIG(g_GameConfig, "UTIL_Remove", addresses::UTIL_Remove);
+	RESOLVE_SIG(g_GameConfig, "NetworkStateChanged", addresses::NetworkStateChanged);
 	RESOLVE_SIG(g_GameConfig, "CEntitySystem_AddEntityIOEvent", addresses::CEntitySystem_AddEntityIOEvent);
 	RESOLVE_SIG(g_GameConfig, "CEntityInstance_AcceptInput", addresses::CEntityInstance_AcceptInput);
 	RESOLVE_SIG(g_GameConfig, "CGameEntitySystem_FindEntityByClassName", addresses::CGameEntitySystem_FindEntityByClassName);
diff --git a/src/addresses.h b/src/addresses.h
@@ -58,7 +58,7 @@ class INetworkStringTable;
 class CCSPlayer_WeaponServices;
 class CBasePlayerWeapon;
 class CSpawnGroupMgrGameSystem;
-
+class CNetworkStateChangedInfo;
 struct EmitSound_t;
 struct SndOpEventGuid_t;
 
@@ -85,7 +85,7 @@ namespace addresses
 	inline void(FASTCALL* CBaseModelEntity_SetModel)(CBaseModelEntity* pModel, const char* szModel);
 	inline void(FASTCALL* UTIL_Remove)(CEntityInstance*);
 
-	
+	inline void(FASTCALL* NetworkStateChanged)(void* chainEntity, CNetworkStateChangedInfo& info);
 
 	inline void(FASTCALL* CEntitySystem_AddEntityIOEvent)(CEntitySystem* pEntitySystem, CEntityInstance* pTarget, const char* pszInput,
 														  CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, float flDelay, int outputID);
diff --git a/src/cs2_sdk/schema.cpp b/src/cs2_sdk/schema.cpp
@@ -1,4 +1,4 @@
-/**
+﻿/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -131,14 +131,17 @@ SchemaKey schema::GetOffset(const char* className, uint32_t classKey, const char
 	return tableMap->Element(memberIndex);
 }
 
-void EntityNetworkStateChanged(uintptr_t entityInstance, uint nOffset)
+void NetworkStateChanged(uintptr_t chainEntity, uint32_t offset, uint32_t nArrayIndex, uint32_t nPathIndex)
 {
-	reinterpret_cast<CEntityInstance*>(entityInstance)->NetworkStateChanged(nOffset);
+	CNetworkStateChangedInfo info(offset, nArrayIndex, nPathIndex);
+
+	addresses::NetworkStateChanged(reinterpret_cast<void*>(chainEntity), info);
 }
 
-void ChainNetworkStateChanged(uintptr_t networkVarChainer, uint nLocalOffset)
+void SetStateChanged(uintptr_t pEntity, uint32_t offset, uint32_t nArrayIndex, uint32_t nPathIndex)
 {
-	CEntityInstance* pEntity = *reinterpret_cast<CEntityInstance**>(networkVarChainer);
-	if (pEntity && (pEntity->m_pEntity->m_flags & EF_IS_CONSTRUCTION_IN_PROGRESS) == 0)
-		pEntity->NetworkStateChanged(nLocalOffset, -1, *reinterpret_cast<ChangeAccessorFieldPathIndex_t*>(networkVarChainer + 32));
+	CNetworkStateChangedInfo info(offset, nArrayIndex, nPathIndex);
+
+	static auto fnOffset = g_GameConfig->GetOffset("CBaseEntity::StateChanged");
+	CALL_VIRTUAL(void, fnOffset, (void*)pEntity, &info);
 }
diff --git a/src/cs2_sdk/schema.h b/src/cs2_sdk/schema.h
@@ -1,4 +1,4 @@
-/**
+﻿/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE
@@ -37,14 +37,44 @@
 #include "virtual.h"
 #undef schema
 
+class CBaseEntity;
+
 struct SchemaKey
 {
 	int32 offset;
 	bool networked;
 };
 
-void EntityNetworkStateChanged(uintptr_t entityInstance, uint nOffset);
-void ChainNetworkStateChanged(uintptr_t networkVarChainer, uint nLocalOffset);
+struct CNetworkStateChangedInfo
+{
+	CNetworkStateChangedInfo() = delete;
+
+	CNetworkStateChangedInfo(uint32_t nOffset, uint32_t nArrayIndex, uint32_t nPathIndex)
+	{
+		m_vecOffsetData.EnsureCount(1);
+		m_vecOffsetData[0] = nOffset;
+
+		unk_30 = -1;
+
+		unk_3c = 0;
+
+		m_nArrayIndex = nArrayIndex;
+		m_nPathIndex = nPathIndex;
+	}
+
+private:
+	int m_nSize;						  // 0x0
+	CUtlVector<uint32_t> m_vecOffsetData; // 0x8
+	char* m_pszFieldName{};				  // 0x20
+	char* m_pszFileName{};				  // 0x28
+	uint32_t unk_30 = -1;				  // 0x30
+	uint32_t m_nArrayIndex{};			  // 0x34
+	uint32_t m_nPathIndex{};			  // 0x38
+	uint16_t unk_3c{};					  // 0x3c
+}; // Size: 0x3e
+
+void NetworkStateChanged(uintptr_t chainEntity, uint32_t offset, uint32_t nArrayIndex = -1, uint32_t nPathIndex = -1);
+void SetStateChanged(uintptr_t pEntity, uint32_t offset, uint32_t nArrayIndex = -1, uint32_t nPathIndex = -1);
 
 constexpr uint32_t val_32_const = 0x811c9dc5;
 constexpr uint32_t prime_32_const = 0x1000193;
@@ -96,16 +126,17 @@ inline constexpr uint64_t hash_64_fnv1a_const(const char* const str, const uint6
 			if (m_chain != 0 && m_key.networked)                                                                      \
 			{                                                                                                         \
 				DevMsg("Found chain offset %d for %s::%s\n", m_chain, ThisClassName, #varName);                       \
-				ChainNetworkStateChanged((uintptr_t)(pThisClass) + m_chain, m_key.offset + extra_offset);             \
+				::NetworkStateChanged((uintptr_t)(pThisClass) + m_chain, m_key.offset + extra_offset);                \
 			}                                                                                                         \
 			else if (m_key.networked)                                                                                 \
 			{                                                                                                         \
 				/* WIP: Works fine for most props, but inlined classes in the middle of a class will                  \
 					need to have their this pointer corrected by the offset .*/                                       \
 				if (!IsStruct)                                                                                        \
-					EntityNetworkStateChanged((uintptr_t)pThisClass, m_key.offset + extra_offset);                    \
-				else                                                                                                  \
-					CALL_VIRTUAL(void, 1, pThisClass, m_key.offset + extra_offset, 0xFFFFFFFF, 0xFFFFFFFF);           \
+					::SetStateChanged((uintptr_t)pThisClass, m_key.offset + extra_offset);                            \
+				/* Crash here if no VTable */                                                                         \
+				/*else                                                                                                \
+					CALL_VIRTUAL(void, 1, pThisClass, m_key.offset + extra_offset, 0xFFFFFFFF, 0xFFFFFFFF);*/         \
 			}                                                                                                         \
 			*reinterpret_cast<std::add_pointer_t<type>>((uintptr_t)(pThisClass) + m_key.offset + extra_offset) = val; \
 		}                                                                                                             \
diff --git a/src/utils/virtual.h b/src/utils/virtual.h
@@ -1,4 +1,4 @@
-/**
+﻿/**
  * =============================================================================
  * CS2Fixes
  * Copyright (C) 2023-2025 Source2ZE

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/**`
	`1`	`+/**`
`2`	`2`	`* =============================================================================`
`3`	`3`	`* CS2Fixes`
`4`	`4`	`* Copyright (C) 2023-2025 Source2ZE`
`@@ -131,14 +131,17 @@ SchemaKey schema::GetOffset(const char* className, uint32_t classKey, const char`
`131`	`131`	`return tableMap->Element(memberIndex);`
`132`	`132`	`}`
`133`	`133`
`134`		`-void EntityNetworkStateChanged(uintptr_t entityInstance, uint nOffset)`
	`134`	`+void NetworkStateChanged(uintptr_t chainEntity, uint32_t offset, uint32_t nArrayIndex, uint32_t nPathIndex)`
`135`	`135`	`{`
`136`		`- reinterpret_cast<CEntityInstance*>(entityInstance)->NetworkStateChanged(nOffset);`
	`136`	`+ CNetworkStateChangedInfo info(offset, nArrayIndex, nPathIndex);`
	`137`	`+`
	`138`	`+ addresses::NetworkStateChanged(reinterpret_cast<void*>(chainEntity), info);`
`137`	`139`	`}`
`138`	`140`
`139`		`-void ChainNetworkStateChanged(uintptr_t networkVarChainer, uint nLocalOffset)`
	`141`	`+void SetStateChanged(uintptr_t pEntity, uint32_t offset, uint32_t nArrayIndex, uint32_t nPathIndex)`
`140`	`142`	`{`
`141`		`- CEntityInstance* pEntity = reinterpret_cast<CEntityInstance*>(networkVarChainer);`
`142`		`- if (pEntity && (pEntity->m_pEntity->m_flags & EF_IS_CONSTRUCTION_IN_PROGRESS) == 0)`
`143`		`- pEntity->NetworkStateChanged(nLocalOffset, -1, reinterpret_cast<ChangeAccessorFieldPathIndex_t>(networkVarChainer + 32));`
	`143`	`+ CNetworkStateChangedInfo info(offset, nArrayIndex, nPathIndex);`
	`144`	`+`
	`145`	`+ static auto fnOffset = g_GameConfig->GetOffset("CBaseEntity::StateChanged");`
	`146`	`+ CALL_VIRTUAL(void, fnOffset, (void*)pEntity, &info);`
`144`	`147`	`}`