Change GoToIntermission detour to a virtual hook

For whatever reason, the signature is extremely unstable, and has been breaking nearly every CS2 update

Author: Vauff

gamedata/cs2fixes.games.txt

@@ -316,14 +316,6 @@
 				"linux"      "\x55\x48\x89\xE5\x41\x55\x41\x54\x48\x83\xEC\x10\x4C\x8B\x26\x4D\x85\xE4\x74\x2A"
 			}
 
-			// "Going to intermission...\n"
-			"CCSGameRules_GoToIntermission"
-			{
-				"library"	"server"
-				"windows"	"\x48\x8B\xC4\x55\x53\x56\x57\x41\x56\x48\x8D\xA8\x2A\x2A\x2A\x2A\x48\x81\xEC\x2A\x2A\x2A\x2A\x0F\x29\x78"
-				"linux"		"\x55\x31\xC0\x48\x89\xE5\x41\x57\x41\x56\x41\x89\xF6\x41\x55\x41\x54\x49\x89\xFC\x53"
-			}
-
 			// Return value of this function is used to determine whether "NETWORK_DISCONNECT_REJECT_SERVERFULL to %s: Cannot get free client\n" gets printed
 			"GetFreeClient"
 			{
@@ -444,6 +436,11 @@
 				"windows"		"20"
 				"linux"			"21"
 			}
+			"CCSGameRules_GoToIntermission"
+			{
+				"windows"		"128"
+				"linux"			"129"
+			}
 		}
 		"Patches"
 		{

src/cs2fixes.cpp

@@ -116,6 +116,7 @@ SH_DECL_MANUALHOOK2_void(CreateWorkshopMapGroup, 0, 0, 0, const char*, const CUt
 SH_DECL_MANUALHOOK1(OnTakeDamage_Alive, 0, 0, 0, bool, CTakeDamageInfoContainer *);
 SH_DECL_MANUALHOOK1_void(CheckMovingGround, 0, 0, 0, double);
 SH_DECL_HOOK2(IGameEventManager2, LoadEventsFromFile, SH_NOATTRIB, 0, int, const char *, bool);
+SH_DECL_MANUALHOOK2(GoToIntermission, 0, 0, 0, int64_t*, int64_t, char);
 
 CS2Fixes g_CS2Fixes;
 
@@ -137,6 +138,7 @@ int g_iCreateWorkshopMapGroupId = -1;
 int g_iOnTakeDamageAliveId = -1;
 int g_iCheckMovingGroundId = -1;
 int g_iLoadEventsFromFileId = -1;
+int g_iGoToIntermissionId = -1;
 
 CGameEntitySystem *GameEntitySystem()
 {
@@ -189,7 +191,10 @@ bool CS2Fixes::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bool
 	int offset = g_GameConfig->GetOffset("IGameTypes_CreateWorkshopMapGroup");
 	SH_MANUALHOOK_RECONFIGURE(CreateWorkshopMapGroup, offset, 0, 0);
 
-    SH_ADD_HOOK(IServerGameDLL, GameFrame, g_pSource2Server, SH_MEMBER(this, &CS2Fixes::Hook_GameFramePost), true);
+	offset = g_GameConfig->GetOffset("CCSGameRules_GoToIntermission");
+	SH_MANUALHOOK_RECONFIGURE(GoToIntermission, offset, 0, 0);
+
+	SH_ADD_HOOK(IServerGameDLL, GameFrame, g_pSource2Server, SH_MEMBER(this, &CS2Fixes::Hook_GameFramePost), true);
 	SH_ADD_HOOK(IServerGameDLL, GameServerSteamAPIActivated, g_pSource2Server, SH_MEMBER(this, &CS2Fixes::Hook_GameServerSteamAPIActivated), false);
 	SH_ADD_HOOK(IServerGameDLL, GameServerSteamAPIDeactivated, g_pSource2Server, SH_MEMBER(this, &CS2Fixes::Hook_GameServerSteamAPIDeactivated), false);
 	SH_ADD_HOOK(IServerGameDLL, ApplyGameSettings, g_pSource2Server, SH_MEMBER(this, &CS2Fixes::Hook_ApplyGameSettings), false);
@@ -356,6 +361,9 @@ bool CS2Fixes::Unload(char *error, size_t maxlen)
 	SH_REMOVE_HOOK_ID(g_iOnTakeDamageAliveId);
 	SH_REMOVE_HOOK_ID(g_iCheckMovingGroundId);
 
+	if (g_iGoToIntermissionId != -1)
+		SH_REMOVE_HOOK_ID(g_iGoToIntermissionId);
+
 	ConVar_Unregister();
 
 	g_CommandList.Purge();
@@ -868,6 +876,24 @@ void CS2Fixes::Hook_CreateWorkshopMapGroup(const char* name, const CUtlStringLis
 		RETURN_META(MRES_IGNORED);
 }
 
+void CS2Fixes::CreateGoToIntermissionHook()
+{
+	g_iGoToIntermissionId = SH_ADD_MANUALVPHOOK(GoToIntermission, g_pGameRules, SH_MEMBER(this, &CS2Fixes::Hook_GoToIntermission), false);
+}
+
+void CS2Fixes::RemoveGoToIntermissionHook()
+{
+	SH_REMOVE_HOOK_ID(g_iGoToIntermissionId);
+}
+
+int64_t* CS2Fixes::Hook_GoToIntermission(int64_t unk1, char unk2)
+{
+	if (!g_pMapVoteSystem->IsIntermissionAllowed())
+		RETURN_META_VALUE(MRES_SUPERCEDE, nullptr);
+
+	RETURN_META_NOREF(MRES_IGNORED, int64_t*);
+}
+
 bool g_bDropMapWeapons = false;
 
 FAKE_BOOL_CVAR(cs2f_drop_map_weapons, "Whether to force drop map-spawned weapons on death", g_bDropMapWeapons, false, false)

src/cs2fixes.h

@@ -64,6 +64,9 @@ class CS2Fixes : public ISmmPlugin, public IMetamodListener
 	void Hook_StartupServer(const GameSessionConfiguration_t& config, ISource2WorldSession*, const char*);
 	void Hook_ApplyGameSettings(KeyValues* pKV);
 	void Hook_CreateWorkshopMapGroup(const char* name, const CUtlStringList& mapList);
+	void CreateGoToIntermissionHook();
+	void RemoveGoToIntermissionHook();
+	int64_t* Hook_GoToIntermission(int64_t unk1, char unk2);
 	bool Hook_OnTakeDamage_Alive(CTakeDamageInfoContainer *pInfoContainer);
 	void Hook_CheckMovingGround(double frametime);
 	int Hook_LoadEventsFromFile(const char *filename, bool bSearchAll);

src/detours.cpp

@@ -72,7 +72,6 @@ DECLARE_DETOUR(ProcessMovement, Detour_ProcessMovement);
 DECLARE_DETOUR(ProcessUsercmds, Detour_ProcessUsercmds);
 DECLARE_DETOUR(CGamePlayerEquip_InputTriggerForAllPlayers, Detour_CGamePlayerEquip_InputTriggerForAllPlayers);
 DECLARE_DETOUR(CGamePlayerEquip_InputTriggerForActivatedPlayer, Detour_CGamePlayerEquip_InputTriggerForActivatedPlayer);
-DECLARE_DETOUR(CCSGameRules_GoToIntermission, Detour_CCSGameRules_GoToIntermission);
 DECLARE_DETOUR(GetFreeClient, Detour_GetFreeClient);
 DECLARE_DETOUR(CCSPlayerPawn_GetMaxSpeed, Detour_CCSPlayerPawn_GetMaxSpeed);
 
@@ -508,14 +507,6 @@ void FASTCALL Detour_CGamePlayerEquip_InputTriggerForActivatedPlayer(CGamePlayer
 		CGamePlayerEquip_InputTriggerForActivatedPlayer(pEntity, pInput);
 }
 
-int64_t* FASTCALL Detour_CCSGameRules_GoToIntermission(int64_t unk1, char unk2)
-{
-	if (!g_pMapVoteSystem->IsIntermissionAllowed())
-		return nullptr;
-
-	return CCSGameRules_GoToIntermission(unk1, unk2);
-}
-
 CServerSideClient* FASTCALL Detour_GetFreeClient(int64_t unk1, const __m128i* unk2, unsigned int unk3, int64_t unk4, char unk5, void* unk6)
 {
 	// Check if there is still unused slots, this should never break so just fall back to original behaviour for ease (we don't have a CServerSideClient constructor)

src/detours.h

@@ -62,6 +62,5 @@ void FASTCALL Detour_ProcessMovement(CCSPlayer_MovementServices *pThis, void *pM
 void *FASTCALL Detour_ProcessUsercmds(CCSPlayerController *pController, CUserCmd *cmds, int numcmds, bool paused, float margin);
 void FASTCALL  Detour_CGamePlayerEquip_InputTriggerForAllPlayers(CGamePlayerEquip*, InputData_t*);
 void FASTCALL  Detour_CGamePlayerEquip_InputTriggerForActivatedPlayer(CGamePlayerEquip*, InputData_t*);
-int64_t* FASTCALL Detour_CCSGameRules_GoToIntermission(int64_t unk1, char unk2);
 CServerSideClient* FASTCALL Detour_GetFreeClient(int64_t unk1, const __m128i* unk2, unsigned int unk3, int64_t unk4, char unk5, void* unk6);
 float FASTCALL Detour_CCSPlayerPawn_GetMaxSpeed(CCSPlayerPawn*);

src/entitylistener.cpp

@@ -51,11 +51,16 @@ void CEntityListener::OnEntityCreated(CEntityInstance* pEntity)
 	ExecuteOnce(Patch_GetHammerUniqueId(pEntity));
 
 	if (!V_strcmp("cs_gamerules", pEntity->GetClassname()))
+	{
 		g_pGameRules = ((CCSGameRulesProxy*)pEntity)->m_pGameRules;
+		g_CS2Fixes.CreateGoToIntermissionHook();
+	}
 }
 
 void CEntityListener::OnEntityDeleted(CEntityInstance* pEntity)
 {
+	if (!V_strcmp("cs_gamerules", pEntity->GetClassname()))
+		g_CS2Fixes.RemoveGoToIntermissionHook();
 }
 
 void CEntityListener::OnEntityParentChanged(CEntityInstance* pEntity, CEntityInstance* pNewParent)