Fix error in DoesBuildHelpRush()

LoneGazebo · Jun 8, 2024 · 37e3f4a · 37e3f4a
1 parent 9052b3d
commit 37e3f4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvBuilderTaskingAI.cpp b/CvGameCoreDLL_Expansion2/CvBuilderTaskingAI.cpp
@@ -2138,7 +2138,7 @@ void CvBuilderTaskingAI::AddRemoveRouteDirective(vector<OptionWithScore<BuilderD
 
 	//if we are losing gold, be more aggressive
 	if (iNetGoldTimes100 < -1000)
-		iWeight = iWeight *= 10;
+		iWeight *= 10;
 
 	iWeight /= 10;
 
@@ -2616,7 +2616,7 @@ int CvBuilderTaskingAI::GetResourceWeight(ResourceTypes eResource, int iQuantity
 	return 0;
 }
 
-/// Does this city want to rush a unit?
+/// Does this city want to rush a build?
 bool CvBuilderTaskingAI::DoesBuildHelpRush(CvPlot* pPlot, BuildTypes eBuild)
 {
 	CvCity* pCity = NULL;
@@ -2644,7 +2644,7 @@ bool CvBuilderTaskingAI::DoesBuildHelpRush(CvPlot* pPlot, BuildTypes eBuild)
 		return false;
 	}
 
-	return false;
+	return true;
 }
 
 static int GetNumAdjacent(CvPlot* pPlot, ImprovementTypes eImprovement, SBuilderState sState)

diff --git a/CvGameCoreDLL_Expansion2/CvGame.cpp b/CvGameCoreDLL_Expansion2/CvGame.cpp
@@ -6555,7 +6555,7 @@ bool CvGame::CanPlayerAttemptDominationVictory(PlayerTypes ePlayer, PlayerTypes
 					return false;
 
 				// Already at war, but making peace with this player would stop us from eliminating everyone?
-				if (eMakePeacePlayer != NO_PLAYER && eMakePeacePlayer == kPlayer.GetID())
+				if (eMakePeacePlayer == kPlayer.GetID())
 					return false;
 			}
 			else