Fix rendermode migrations breaking maps that used enum values

Author: Vauff

src/cs2fixes.cpp

@@ -95,6 +95,7 @@ SH_DECL_MANUALHOOK1_void(GoToIntermission, 0, 0, 0, bool);
 SH_DECL_MANUALHOOK2_void(PhysicsTouchShuffle, 0, 0, 0, CUtlVector<TouchLinked_t>*, bool);
 SH_DECL_MANUALHOOK3_void(DropWeapon, 0, 0, 0, CBasePlayerWeapon*, Vector*, Vector*);
 SH_DECL_HOOK1_void(IServer, SetGameSpawnGroupMgr, SH_NOATTRIB, 0, IGameSpawnGroupMgr*);
+SH_DECL_HOOK2_void(CEntitySystem, Spawn, SH_NOATTRIB, 0, int, const EntitySpawnInfo_t*);
 
 CS2Fixes g_CS2Fixes;
 IGameEventSystem* g_gameEventSystem = nullptr;
@@ -118,6 +119,7 @@ int g_iGoToIntermissionId = -1;
 int g_iPhysicsTouchShuffle = -1;
 int g_iWeaponServiceDropWeaponId = -1;
 int g_iSetGameSpawnGroupMgrId = -1;
+int g_iSpawnId = -1;
 
 double g_flUniversalTime = 0.0;
 float g_flLastTickedTime = 0.0f;
@@ -317,9 +319,11 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 	g_iWeaponServiceDropWeaponId = SH_ADD_MANUALDVPHOOK(DropWeapon, pCCSPlayer_WeaponServicesVTable, SH_MEMBER(this, &CS2Fixes::Hook_DropWeaponPost), true);
 
 	auto pCGameEventManagerVTable = (IGameEventManager2*)modules::server->FindVirtualTable("CGameEventManager");
-
 	g_iLoadEventsFromFileId = SH_ADD_DVPHOOK(IGameEventManager2, LoadEventsFromFile, pCGameEventManagerVTable, SH_MEMBER(this, &CS2Fixes::Hook_LoadEventsFromFile), false);
 
+	auto pCEntitySystemVTable = (CEntitySystem*)modules::server->FindVirtualTable("CGameEntitySystem");
+	g_iSpawnId = SH_ADD_DVPHOOK(CEntitySystem, Spawn, pCEntitySystemVTable, SH_MEMBER(this, &CS2Fixes::Hook_SpawnPost), true);
+
 	if (!bRequiredInitLoaded)
 	{
 		snprintf(error, maxlen, "One or more address lookups, patches or detours failed, please refer to startup logs for more information");
@@ -441,6 +445,7 @@ bool CS2Fixes::Unload(char* error, size_t maxlen)
 	SH_REMOVE_HOOK_ID(g_iCGamePlayerEquipPrecacheId);
 	SH_REMOVE_HOOK_ID(g_iCTriggerGravityPrecacheId);
 	SH_REMOVE_HOOK_ID(g_iCTriggerGravityEndTouchId);
+	SH_REMOVE_HOOK_ID(g_iSpawnId);
 
 	if (g_iSetGameSpawnGroupMgrId != -1)
 		SH_REMOVE_HOOK_ID(g_iSetGameSpawnGroupMgrId);
@@ -1214,6 +1219,12 @@ void CS2Fixes::Hook_SetGameSpawnGroupMgr(IGameSpawnGroupMgr* pSpawnGroupMgr)
 	g_pSpawnGroupMgr = (CSpawnGroupMgrGameSystem*)pSpawnGroupMgr;
 }
 
+void CS2Fixes::Hook_SpawnPost(int nCount, const EntitySpawnInfo_t* pInfo)
+{
+	for (int i = 0; i < nCount; i++)
+		g_pMapMigrations->OnEntitySpawned(pInfo[i].m_pEntity->m_pInstance, pInfo[i].m_pKeyValues);
+}
+
 void* CS2Fixes::OnMetamodQuery(const char* iface, int* ret)
 {
 	if (V_strcmp(iface, CS2FIXES_INTERFACE))

src/cs2fixes.h

@@ -109,6 +109,7 @@ class CS2Fixes : public ISmmPlugin, public IMetamodListener, public ICS2Fixes
 	void Hook_DropWeaponPost(CBasePlayerWeapon* pWeapon, Vector* pVecTarget, Vector* pVelocity);
 	int Hook_LoadEventsFromFile(const char* filename, bool bSearchAll);
 	void Hook_SetGameSpawnGroupMgr(IGameSpawnGroupMgr* pSpawnGroupMgr);
+	void Hook_SpawnPost(int nCount, const EntitySpawnInfo_t* pInfo);
 
 public: // MetaMod API
 	void* OnMetamodQuery(const char* iface, int* ret);

src/entitylistener.cpp

@@ -25,7 +25,6 @@
 #include "entity/cgamerules.h"
 #include "entwatch.h"
 #include "gameconfig.h"
-#include "mapmigrations.h"
 #include "plat.h"
 
 CEntityListener* g_pEntityListener = nullptr;
@@ -56,8 +55,6 @@ void CEntityListener::OnEntitySpawned(CEntityInstance* pEntity)
 
 	if (g_cvarEnableEntWatch.Get())
 		EW_OnEntitySpawned(pEntity);
-
-	g_pMapMigrations->OnEntitySpawned(pEntity);
 }
 
 void CEntityListener::OnEntityCreated(CEntityInstance* pEntity)

src/events.cpp

@@ -30,6 +30,7 @@
 #include "idlemanager.h"
 #include "leader.h"
 #include "map_votes.h"
+#include "mapmigrations.h"
 #include "panoramavote.h"
 #include "recipientfilters.h"
 #include "topdefender.h"
@@ -85,6 +86,8 @@ GAME_EVENT_F(round_prestart)
 
 	if (g_cvarEnableEntWatch.Get())
 		EW_RoundPreStart();
+
+	g_pMapMigrations->OnRoundPrestart();
 }
 
 CConVar<bool> g_cvarBlockTeamMessages("cs2f_block_team_messages", FCVAR_NONE, "Whether to block team join messages", false);

src/mapmigrations.cpp

@@ -40,29 +40,49 @@ void CMapMigrations::ApplyGameSettings(KeyValues* pKV)
 	CMapMigrationWorkshopDetailsQuery::Create(pKV->FindKey("launchoptions")->GetUint64("customgamemode"));
 }
 
-void CMapMigrations::OnEntitySpawned(CEntityInstance* pEntity)
+void CMapMigrations::OnRoundPrestart()
 {
-	if (g_cvarMapMigrations20260121.Get() == 1 || (g_cvarMapMigrations20260121.Get() == 2 && m_timeMapUpdated < g_time20260121))
-		Migration_20260121(pEntity);
+	m_vecModelEntitiesUsingRendermodeEnum.clear();
 }
 
-void CMapMigrations::Migration_20260121(CEntityInstance* pEntity)
+void CMapMigrations::OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues)
 {
 	CBaseEntity* pBaseEntity = (CBaseEntity*)pEntity;
 
+	// Stupid workaround for CEntityKeyValues being inaccessible after entity spawn
+	// We need access to this in 2026-01-21 rendermode migrations when called from UpdateMapUpdateTime
+	if (pBaseEntity->AsBaseModelEntity() && V_StringToInt32(pKeyValues->GetString("rendermode"), -1, NULL, NULL, PARSING_FLAG_SKIP_WARNING) == -1)
+		m_vecModelEntitiesUsingRendermodeEnum.push_back(pBaseEntity->GetHandle());
+
+	RunMigrations(pBaseEntity);
+}
+
+void CMapMigrations::RunMigrations(CBaseEntity* pEntity)
+{
+	if (g_cvarMapMigrations20260121.Get() == 1 || (g_cvarMapMigrations20260121.Get() == 2 && m_timeMapUpdated < g_time20260121))
+		Migrations_20260121(pEntity);
+}
+
+void CMapMigrations::Migrations_20260121(CBaseEntity* pEntity)
+{
 	if (!V_strcasecmp(pEntity->GetClassname(), "func_door_rotating"))
 	{
-		uint32 spawnFlags = pBaseEntity->m_spawnflags();
+		uint32 spawnFlags = pEntity->m_spawnflags();
 
-		// Force add One-way flag if not present
-		if (!(spawnFlags & 16))
-			pBaseEntity->m_spawnflags = spawnFlags + 16;
+		if (!(spawnFlags & SF_DOOR_ONEWAY))
+			pEntity->m_spawnflags = spawnFlags + SF_DOOR_ONEWAY;
 	}
 
-	CBaseModelEntity* pModelEntity = pBaseEntity->AsBaseModelEntity();
+	CBaseModelEntity* pModelEntity = pEntity->AsBaseModelEntity();
 
 	if (pModelEntity)
 	{
+		// Also need to make sure the entity is using index-based rendermodes, and not enum-based ones (which will already automatically migrate correctly)
+		// This differentiation is lost after entity spawn, so we had to check the original keyvalue earlier instead
+		for (int i = 0; i < m_vecModelEntitiesUsingRendermodeEnum.size(); i++)
+			if (m_vecModelEntitiesUsingRendermodeEnum[i] == pModelEntity->GetHandle())
+				return;
+
 		RenderMode_t renderMode = pModelEntity->m_nRenderMode();
 
 		// Legacy kRenderTransAlpha
@@ -85,7 +105,7 @@ void CMapMigrations::UpdateMapUpdateTime(time_t timeMapUpdated)
 
 	// May be called late, so also check any existing entities first
 	while ((pTarget = UTIL_FindEntityByName(pTarget, "*")))
-		OnEntitySpawned(pTarget);
+		RunMigrations(pTarget);
 }
 
 std::shared_ptr<CMapMigrationWorkshopDetailsQuery> CMapMigrationWorkshopDetailsQuery::Create(uint64 iWorkshopId)

src/mapmigrations.h

@@ -21,12 +21,15 @@
 
 #include "KeyValues.h"
 #include "convar.h"
+#include "ehandle.h"
 #include "entitysystem.h"
 #include "steam/isteamugc.h"
 #include <vector>
 
 extern CConVar<int> g_cvarMapMigrations20260121;
 
+#define SF_DOOR_ONEWAY 16
+
 class CMapMigrationWorkshopDetailsQuery : public std::enable_shared_from_this<CMapMigrationWorkshopDetailsQuery>
 {
 public:
@@ -48,15 +51,18 @@ class CMapMigrations
 {
 public:
 	void ApplyGameSettings(KeyValues* pKV);
-	void OnEntitySpawned(CEntityInstance* pEntity);
-	void Migration_20260121(CEntityInstance* pEntity);
+	void OnRoundPrestart();
+	void OnEntitySpawned(CEntityInstance* pEntity, const CEntityKeyValues* pKeyValues);
+	void RunMigrations(CBaseEntity* pEntity);
+	void Migrations_20260121(CBaseEntity* pEntity);
 	void UpdateMapUpdateTime(time_t timeMapUpdated);
 	void AddWorkshopDetailsQuery(std::shared_ptr<CMapMigrationWorkshopDetailsQuery> pQuery) { m_vecWorkshopDetailsQueries.push_back(pQuery); }
 	void RemoveWorkshopDetailsQuery(std::shared_ptr<CMapMigrationWorkshopDetailsQuery> pQuery) { m_vecWorkshopDetailsQueries.erase(std::remove(m_vecWorkshopDetailsQueries.begin(), m_vecWorkshopDetailsQueries.end(), pQuery), m_vecWorkshopDetailsQueries.end()); }
 
 private:
 	time_t m_timeMapUpdated = std::numeric_limits<time_t>::max();
 	std::vector<std::shared_ptr<CMapMigrationWorkshopDetailsQuery>> m_vecWorkshopDetailsQueries;
+	std::vector<CHandle<CBaseEntity>> m_vecModelEntitiesUsingRendermodeEnum;
 };
 
 extern CMapMigrations* g_pMapMigrations;