4.18.2 fixes (#11528)

* fix #11524 removed a wrong assert * fix #11526 added an assert in case i missed something
LoneGazebo · Jan 14, 2025 · 661bb3a · 661bb3a
1 parent a5f2629
commit 661bb3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvCity.cpp b/CvGameCoreDLL_Expansion2/CvCity.cpp
@@ -27341,7 +27341,7 @@ void CvCity::GetBuyablePlotList(std::vector<int>& aiPlotList, bool bForPurchase,
 
 	int iYieldLoop = 0;
 
-	// we have to use a larger value than iMaxRange because straight lines may be blocked by mountains etc.
+	// We have to use a larger value than iMaxRange because straight lines may be blocked by mountains etc.
 	SPathFinderUserData data(getOwner(), PT_CITY_INFLUENCE, 2 * iMaxRange);
 
 	int iWorkPlotDistance = getWorkPlotDistance();
@@ -27653,8 +27653,8 @@ int CvCity::calculateInfluenceDistance(CvPlot* pDest, int iMaxRange) const
 	if (pDest == NULL)
 		return -1;
 
-	// we have to use iMaxRange + 1 to find plots that are at up to iMaxRange tiles away because for influence pathfinding iStartMoves = 0 is used
-	SPathFinderUserData data(getOwner(), PT_CITY_INFLUENCE, iMaxRange + 1);
+	// We have to use a larger value than iMaxRange because straight lines may be blocked by mountains etc.
+	SPathFinderUserData data(getOwner(), PT_CITY_INFLUENCE, 2 * iMaxRange);
 	SPath path = GC.GetStepFinder().GetPath(getX(), getY(), pDest->getX(), pDest->getY(), data);
 	if (!path)
 		return -1; // no passable path exists
@@ -28326,12 +28326,13 @@ void CvCity::DoUpdateCheapestPlotInfluenceDistance()
 	vector<int> plots;
 	GetBuyablePlotList(plots, false);
 
+	int iInfluenceDistance = INT_MAX;
 	if (!plots.empty())
 	{
-		SetCheapestPlotInfluenceDistance(calculateInfluenceDistance(GC.getMap().plotByIndex(plots.front()), /*5*/ range(GD_INT_GET(MAXIMUM_ACQUIRE_PLOT_DISTANCE), 1, MAX_CITY_RADIUS)));
+		iInfluenceDistance = calculateInfluenceDistance(GC.getMap().plotByIndex(plots.front()), /*5*/ range(GD_INT_GET(MAXIMUM_ACQUIRE_PLOT_DISTANCE), 1, MAX_CITY_RADIUS));
+		ASSERT(iInfluenceDistance != -1, "Plots returned from GetBuyablePlotList() should always be reachable");
 	}
-	else
-		SetCheapestPlotInfluenceDistance(INT_MAX);
+	SetCheapestPlotInfluenceDistance(iInfluenceDistance);
 }
 
 void CvCity::UpdateYieldsFromExistingFriendsAndAllies(bool bRemove)

diff --git a/CvGameCoreDLL_Expansion2/CvUnit.cpp b/CvGameCoreDLL_Expansion2/CvUnit.cpp
@@ -19006,7 +19006,6 @@ int CvUnit::GetNumFriendlyUnitsAdjacent(const CvUnit* pUnitToExclude) const
 /// Is a particular enemy city next to us?
 bool CvUnit::IsEnemyCityAdjacent(const CvCity* pSpecifyCity) const
 {
-	ASSERT(pSpecifyCity, "City is NULL when checking if it is adjacent to a unit");
 	if (plot() != NULL)
 	{
 		return plot()->IsEnemyCityAdjacent(getTeam(), pSpecifyCity);