Subversion Repositories RAND

Compare Revisions

Ignore whitespace Rev 1025 → Rev 1027

/Sources/CvGame.cpp
2716,8 → 2716,11
}
}
int iActiveTurn = getGameTurn();
 
int iActiveTurn = 0;
if (!isPbem())
{
iActiveTurn = getGameTurn();
}
again:
if (!gDLL->GetWorldBuilderMode() || isInAdvancedStart())
{
2822,16 → 2825,28
if ( !gDLL->IsPitbossHost() )
{
CvPlayerAI& kActivePlayer = GET_PLAYER(getActivePlayer());
if ( (!kActivePlayer.isTurnActive() || kActivePlayer.isAutoMoves()) && !kActivePlayer.hasBusyUnit() && !isNetworkMultiPlayer())
{
updateTimers();
if (!isPbem())
{
if ( (!kActivePlayer.isTurnActive() || kActivePlayer.isAutoMoves()) && !kActivePlayer.hasBusyUnit() && !isNetworkMultiPlayer())
{
updateTimers();
 
if (iActiveTurn == getGameTurn())
if (iActiveTurn == getGameTurn())
{
goto again;
}
}
}
else
{
if ( (!kActivePlayer.isTurnActive() || kActivePlayer.isAutoMoves()) && !kActivePlayer.hasBusyUnit() && !isNetworkMultiPlayer() &&
!isPbem() )
{
updateTimers();
 
goto again;
}
}
}
}
}
PROFILE_END();
stopProfilingDLL(false);
/Sources/CvPlot.cpp
10954,7 → 10954,7
if (GC.getBuildInfo(eBuild).getTerrainChange() != NO_TERRAIN)
{
setTerrainType ((TerrainTypes) GC.getBuildInfo(eBuild).getTerrainChange());
//setImprovementType((ImprovementTypes) -1);
setImprovementType((ImprovementTypes) -1);
}
 
if (GC.getBuildInfo(eBuild).getFeatureChange() != NO_FEATURE)
/Sources/CvUnit.cpp
6651,8 → 6651,15
}
}
}
 
iBestInterception *= (100 - m_pUnitInfo->getEvasionProbability());
//45deg - nuke evasion chances increased when launching from a small distance
int iDistanceForEvasion = 0;
int iNukeEvasionFromDistance = 0;
iDistanceForEvasion = plotDistance(getX_INLINE(), getY_INLINE(), iX, iY);
iNukeEvasionFromDistance = (std::max(0, 30 - iDistanceForEvasion));
iNukeEvasionFromDistance *= 2;
iBestInterception *= std::max(10, (100 - m_pUnitInfo->getEvasionProbability() - iNukeEvasionFromDistance));
//iBestInterception *= (100 - m_pUnitInfo->getEvasionProbability());
iBestInterception /= 100;
 
setReconPlot(pPlot);