Fix compile errors

LoneGazebo · Aug 1, 2024 · 5a3eaa8 · 5a3eaa8
1 parent c41be08
commit 5a3eaa8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvPlayerAI.cpp b/CvGameCoreDLL_Expansion2/CvPlayerAI.cpp
@@ -1912,7 +1912,7 @@ GreatPeopleDirectiveTypes CvPlayerAI::GetDirectiveAdmiral(CvUnit* pGreatAdmiral)
 	}
 
 	// Units in armies are always field commanders
-	if (!bHasAdmiralNegation && pGreatGeneral->getArmyID() != -1)
+	if (!bHasAdmiralNegation && pGreatAdmiral->getArmyID() != -1)
 		return GREAT_PEOPLE_DIRECTIVE_FIELD_COMMAND;
 
 	int iCommanders = 0;
@@ -3016,7 +3016,7 @@ priority_queue<SPlotWithScore> CvPlayerAI::GetBestCultureBombPlots(const UnitTyp
 
 			// Don't consider plots we already targeted
 			bool bTooClose = false;
-			for (vector<CvPlot*>::iterator it = vPlotsToAvoid.begin(); it != vPlotsToAvoid.end(); ++it)
+			for (vector<CvPlot*>::const_iterator it = vPlotsToAvoid.begin(); it != vPlotsToAvoid.end(); ++it)
 			{
 				if (plotDistance(**it, *pPlot) < iRange)
 					bTooClose = true;

diff --git a/CvGameCoreDLL_Expansion2/CvPlot.cpp b/CvGameCoreDLL_Expansion2/CvPlot.cpp
@@ -9810,7 +9810,7 @@ int CvPlot::calculateNatureYield(YieldTypes eYield, PlayerTypes ePlayer, Feature
 	} 
 	else
 	{
-		iYield = pKTerrainInfo->getYield(eYield);
+		iYield = pkTerrainInfo->getYield(eYield);
 		if (eYield == YIELD_PRODUCTION && eTerrain == TERRAIN_DESERT && !isHills() && eFeature == NO_FEATURE)
 		{
 			if (eResource != NO_RESOURCE && eImprovement != NO_IMPROVEMENT)
@@ -9865,22 +9865,22 @@ int CvPlot::calculateNatureYield(YieldTypes eYield, PlayerTypes ePlayer, Feature
 	{
 		if (isRiver())
 		{
-			iYield += pKTerrainInfo->getRiverYieldChange(eYield);
+			iYield += pkTerrainInfo->getRiverYieldChange(eYield);
 		}
 
 		if (isHills())
 		{
-			iYield += pKTerrainInfo->getHillsYieldChange(eYield);
+			iYield += pkTerrainInfo->getHillsYieldChange(eYield);
 		}
 
 		if (isFreshWater())
 		{
-			iYield += pKTerrainInfo->getFreshWaterYieldChange(eYield);
+			iYield += pkTerrainInfo->getFreshWaterYieldChange(eYield);
 		}
 
 		if (isCoastalLand())
 		{
-			iYield += pKTerrainInfo->getCoastalLandYieldChange(eYield);
+			iYield += pkTerrainInfo->getCoastalLandYieldChange(eYield);
 		}
 	}
 

diff --git a/CvGameCoreDLL_Expansion2/CvUnit.cpp b/CvGameCoreDLL_Expansion2/CvUnit.cpp
@@ -12601,14 +12601,14 @@ void CvUnit::PerformCultureBomb(int iRadius)
 						}
 					}
 
-					bool bChokePoint = pPlot->IsChokePoint();
+					bool bChokePoint = pLoopPlot->IsChokePoint();
 					if (bChokePoint)
 					{
 						iValueMultiplier += 50;
 						vePlayersStoleHighValueTileFrom[ePlotOwner] = true;
 					}
 
-					ImprovementTypes eImprovement = pPlot->getImprovementType();
+					ImprovementTypes eImprovement = pLoopPlot->getImprovementType();
 					if (eImprovement != NO_IMPROVEMENT)
 					{
 						CvImprovementEntry* pkImprovementInfo = GC.getImprovementInfo(eImprovement);