Logic correction in DoRelationshipPairing()

LoneGazebo · Dec 8, 2024 · 1c3b24f · 1c3b24f
1 parent 6fc8048
commit 1c3b24f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -21227,11 +21227,11 @@ void CvDiplomacyAI::DoRelationshipPairing()
 
 	// STEP 1: Identify our prime league competitor
 	CvLeague* pLeague = GC.getGame().GetGameLeagues()->GetActiveLeague();
-	bool bGoingForDiploVictory = IsCompetingForVictory() && IsGoingForDiploVictory();
-	bool bCloseToDiploVictory = IsCloseToDiploVictory();
+	bool bDiploVictoryEnabled = GC.getGame().isVictoryValid((VictoryTypes) GC.getInfoTypeForString("VICTORY_DIPLOMATIC", true));
+	bool bGoingForDiploVictory = bDiploVictoryEnabled && IsCompetingForVictory() && IsGoingForDiploVictory();
+	bool bCloseToDiploVictory = bDiploVictoryEnabled && IsCloseToDiploVictory();
 
 	// The variables below only matter for Step 1, the ones just above are used later in the function
-	bool bDiploVictoryEnabled = GC.getGame().isVictoryValid((VictoryTypes) GC.getInfoTypeForString("VICTORY_DIPLOMATIC", true));
 	bool bPrimeIsCloseToWinning = false;
 	PlayerTypes ePrimeLeagueCompetitor = NO_PLAYER;
 	int iMyVotes = pLeague != NULL ? pLeague->CalculateStartingVotesForMember(GetID()) : 0;