Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compile errors #11191

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Fix compile errors #11191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CvGameCoreDLL_Expansion2/CvPlayerAI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions CvGameCoreDLL_Expansion2/CvPlot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions CvGameCoreDLL_Expansion2/CvUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down