Add proper ZR support for maps using FireWinCondition

Author: Vauff

src/detours.cpp

@@ -410,7 +410,12 @@ bool FASTCALL Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSym
 	VPROF_SCOPE_BEGIN("Detour_CEntityIdentity_AcceptInput");
 
 	if (g_cvarEnableZR.Get())
-		ZR_Detour_CEntityIdentity_AcceptInput(pThis, pInputName, pActivator, pCaller, value, nOutputID);
+	{
+		bool result = ZR_Detour_CEntityIdentity_AcceptInput(pThis, pInputName, pActivator, pCaller, value, nOutputID);
+
+		if (!result)
+			return result;
+	}
 
 	// Handle KeyValue(s)
 	if (!V_strnicmp(pInputName->String(), "KeyValue", 8))

src/zombiereborn.cpp

@@ -46,7 +46,8 @@
 
 void ZR_Infect(CCSPlayerController* pAttackerController, CCSPlayerController* pVictimController, bool bBroadcast);
 void ZR_Cure(CCSPlayerController* pTargetController);
-void ZR_EndRoundAndAddTeamScore(int iTeamNum);
+void ZR_EndRound(int iTeamNum);
+void ZR_FinishRound(int iTeamNum);
 void SetupCTeams();
 bool ZR_IsTeamAlive(int iTeamNum);
 
@@ -1481,17 +1482,54 @@ AcquireResult ZR_Detour_CCSPlayer_ItemServices_CanAcquire(CCSPlayer_ItemServices
 	return AcquireResult::Allowed;
 }
 
-void ZR_Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLarge* pInputName, CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, int nOutputID)
+bool ZR_Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLarge* pInputName, CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, int nOutputID)
 {
+	const char* inputName = pInputName->String();
+
+	if (!V_strcasecmp(pThis->GetClassname(), "info_map_parameters") && !V_strcasecmp(inputName, "FireWinCondition"))
+	{
+		switch (value->Get<int>())
+		{
+			case CSRoundEndReason::TargetBombed:
+			case CSRoundEndReason::VIPKilled:
+			case CSRoundEndReason::TerroristsEscaped:
+			case CSRoundEndReason::TerroristWin:
+			case CSRoundEndReason::HostagesNotRescued:
+			case CSRoundEndReason::VIPNotEscaped:
+			case CSRoundEndReason::CTSurrender:
+			case CSRoundEndReason::TerroristsPlanted:
+				ZR_FinishRound(CS_TEAM_T);
+				return true;
+			case CSRoundEndReason::VIPEscaped:
+			case CSRoundEndReason::CTStoppedEscape:
+			case CSRoundEndReason::TerroristsStopped:
+			case CSRoundEndReason::BombDefused:
+			case CSRoundEndReason::CTWin:
+			case CSRoundEndReason::HostagesRescued:
+			case CSRoundEndReason::TargetSaved:
+			case CSRoundEndReason::TerroristsNotEscaped:
+			case CSRoundEndReason::TerroristsSurrender:
+			case CSRoundEndReason::CTsReachedHostage:
+				ZR_FinishRound(CS_TEAM_CT);
+				return true;
+			// This would allow maps to mess with timeleft, so we're actually just going to block it entirely
+			case CSRoundEndReason::GameStart:
+				return false;
+			case CSRoundEndReason::Draw:
+			default:
+				ZR_FinishRound(CS_TEAM_NONE);
+				return true;
+		}
+	}
+
 	if (!g_hRespawnToggler.IsValid())
-		return;
+		return true;
 
 	CBaseEntity* relay = g_hRespawnToggler.Get();
-	const char* inputName = pInputName->String();
 
 	// Must be an input into our zr_toggle_respawn relay
 	if (!relay || pThis != relay->m_pEntity)
-		return;
+		return true;
 
 	if (!V_strcasecmp(inputName, "Trigger"))
 		ToggleRespawn();
@@ -1500,9 +1538,10 @@ void ZR_Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLar
 	else if (!V_strcasecmp(inputName, "Disable") && g_bRespawnEnabled)
 		ToggleRespawn(true, false);
 	else
-		return;
+		return true;
 
 	ClientPrintAll(HUD_PRINTTALK, ZR_PREFIX "Respawning is %s!", g_bRespawnEnabled ? "enabled" : "disabled");
+	return true;
 }
 
 void SpawnPlayer(CCSPlayerController* pController)
@@ -1645,7 +1684,7 @@ void ZR_OnRoundTimeWarning(IGameEvent* pEvent)
 	CTimer::Create(10.0, TIMERFLAG_MAP | TIMERFLAG_ROUND, []() {
 		if (g_ZRRoundState == EZRRoundState::ROUND_END)
 			return -1.0f;
-		ZR_EndRoundAndAddTeamScore(g_cvarDefaultWinnerTeam.Get());
+		ZR_EndRound(g_cvarDefaultWinnerTeam.Get());
 		return -1.0f;
 	});
 }
@@ -1676,15 +1715,12 @@ bool ZR_CheckTeamWinConditions(int iTeamNum)
 		return false;
 
 	// allow the team to win
-	ZR_EndRoundAndAddTeamScore(iTeamNum);
+	ZR_EndRound(iTeamNum);
 
 	return true;
 }
 
-// spectator: draw
-// t: t win, add t score
-// ct: ct win, add ct score
-void ZR_EndRoundAndAddTeamScore(int iTeamNum)
+void ZR_EndRound(int iTeamNum)
 {
 	bool bServerIdle = true;
 
@@ -1709,22 +1745,26 @@ void ZR_EndRoundAndAddTeamScore(int iTeamNum)
 	CSRoundEndReason iReason;
 	switch (iTeamNum)
 	{
-		default:
-		case CS_TEAM_SPECTATOR:
-			iReason = CSRoundEndReason::Draw;
-			break;
 		case CS_TEAM_T:
 			iReason = CSRoundEndReason::TerroristWin;
 			break;
 		case CS_TEAM_CT:
 			iReason = CSRoundEndReason::CTWin;
 			break;
+		default:
+			iReason = CSRoundEndReason::Draw;
+			break;
 	}
 
 	static ConVarRefAbstract mp_round_restart_delay("mp_round_restart_delay");
 	float flRestartDelay = mp_round_restart_delay.GetFloat();
 
 	g_pGameRules->TerminateRound(flRestartDelay, iReason);
+	ZR_FinishRound(iTeamNum);
+}
+
+void ZR_FinishRound(int iTeamNum)
+{
 	g_ZRRoundState = EZRRoundState::ROUND_END;
 	ToggleRespawn(true, false);
 

src/zombiereborn.h

@@ -273,7 +273,7 @@ void ZR_OnRoundFreezeEnd(IGameEvent* pEvent);
 void ZR_OnRoundTimeWarning(IGameEvent* pEvent);
 bool ZR_Hook_OnTakeDamage_Alive(CTakeDamageInfo* pInfo, CCSPlayerPawn* pVictimPawn);
 AcquireResult ZR_Detour_CCSPlayer_ItemServices_CanAcquire(CCSPlayer_ItemServices* pItemServices, CEconItemView* pEconItem);
-void ZR_Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLarge* pInputName, CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, int nOutputID);
+bool ZR_Detour_CEntityIdentity_AcceptInput(CEntityIdentity* pThis, CUtlSymbolLarge* pInputName, CEntityInstance* pActivator, CEntityInstance* pCaller, variant_t* value, int nOutputID);
 void ZR_Hook_ClientPutInServer(CPlayerSlot slot, char const* pszName, int type, uint64 xuid);
 void ZR_Hook_ClientCommand_JoinTeam(CPlayerSlot slot, const CCommand& args);
 void ZR_Precache(IEntityResourceManifest* pResourceManifest);