Menu
▾
▴
[Civ4ccp-svn] SF.net SVN: civ4ccp: [37] CvGameCoreDLL
|
From: <imp...@us...> - 2007-03-12 21:10:15
|
Revision: 37
http://civ4ccp.svn.sourceforge.net/civ4ccp/?rev=37&view=rev
Author: impalerwrg
Date: 2007-03-12 14:10:13 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
revert CvGame.cpp
Modified Paths:
--------------
CvGameCoreDLL/CvGame.cpp
CvGameCoreDLL/CvGameCoreDLL.depend
CvGameCoreDLL/CvGameCoreDLL.layout
Modified: CvGameCoreDLL/CvGame.cpp
===================================================================
--- CvGameCoreDLL/CvGame.cpp 2007-03-12 20:28:42 UTC (rev 36)
+++ CvGameCoreDLL/CvGame.cpp 2007-03-12 21:10:13 UTC (rev 37)
@@ -22,7 +22,6 @@
#include "FProfiler.h"
#include "CvReplayInfo.h"
#include "CyPlot.h"
-#include "CvGameTextMgr.h"
// interface uses
#include "CvDLLInterfaceIFaceBase.h"
@@ -30,12 +29,6 @@
#include "CvDLLEventReporterIFaceBase.h"
#include "CvDLLPythonIFaceBase.h"
-// for testing only
-#ifndef FINAL_RELEASE
-//#define DEBUG_OUT_OF_SYNCS
-#endif
-
-
// Public Functions...
CvGame::CvGame()
@@ -232,10 +225,7 @@
{
if (isVictoryValid((VictoryTypes)iI))
{
- // < Mastery Victory by Sevo Start >
- // ORIGINAL CODE if (GC.getVictoryInfo((VictoryTypes)iI).isEndScore())
- if ((GC.getVictoryInfo((VictoryTypes)iI).isEndScore()) || (GC.getVictoryInfo((VictoryTypes)iI).isTotalVictory()))
- // < Mastery Victory End >
+ if ((GC.getVictoryInfo((VictoryTypes)iI).isEndScore()) || (GC.getVictoryInfo((VictoryTypes)iI).isTotalVictory())) // Mastery Victory by Sevo
{
bValid = true;
break;
@@ -254,7 +244,7 @@
setEstimateEndTurn(getGameTurn() + getMaxTurns());
}
- // < Mastery Victory by Sevo Start >
+ // Start Mastery Victory by Sevo
bValid = false;
for (iI = 0; iI < GC.getNumVictoryInfos(); iI++)
{
@@ -272,8 +262,9 @@
setVictoryValid((VictoryTypes)iI, true);
}
}
- // < Mastery Victory End >
+ // End Mastery Victory by Sevo
+
setStartYear(GC.getDefineINT("START_YEAR"));
for (iI = 0; iI < GC.getNumSpecialUnitInfos(); iI++)
@@ -452,12 +443,6 @@
m_bHotPbemBetweenTurns = false;
m_bPlayerOptionsSent = false;
- // < Inquisition Mod by Lopez Start >
- m_bRequireStateReligionForReligionRemoval = true;
- m_bRequireCityOwnerStateReligionMatchForReligionRemoval = true;
- m_bRequireOpenBordersForReligionRemoval = true;
- // < Inquisition Mod End >
-
m_eHandicap = eHandicap;
m_ePausePlayer = NO_PLAYER;
m_eBestLandUnit = NO_UNIT;
@@ -990,7 +975,7 @@
}
}
-/*
+
void CvGame::normalizeAddRiver()
{
CvPlot* pStartingPlot;
@@ -1006,24 +991,12 @@
{
if (!pStartingPlot->isFreshWater())
{
- // < River Maker by ??? Start >
- // if we will be able to add a lake, then use old river code
- if (normalizeFindLakePlot((PlayerTypes)iI) != NULL)
- {
- CvMapGenerator::GetInstance().doRiver(pStartingPlot);
- }
- // otherwise, use new river code which is much more likely to succeed
- else
- {
- CvMapGenerator::GetInstance().addRiver(pStartingPlot);
- }
- // < River Maker End >
+ CvMapGenerator::GetInstance().doRiver(pStartingPlot);
}
}
}
}
}
-*/
void CvGame::normalizeRemovePeaks()
@@ -1064,6 +1037,7 @@
}
}
+
void CvGame::normalizeAddLakes()
{
CvPlot* pStartingPlot;
@@ -1075,59 +1049,47 @@
{
if (GET_PLAYER((PlayerTypes)iI).isAlive())
{
- CvPlot* pLakePlot = normalizeFindLakePlot((PlayerTypes)iI);
- if (pLakePlot != NULL)
- {
- pLakePlot->setPlotType(PLOT_OCEAN);
- }
- }
- }
-}
+ pStartingPlot = GET_PLAYER((PlayerTypes)iI).getStartingPlot();
-CvPlot* CvGame::normalizeFindLakePlot(PlayerTypes ePlayer)
-{
- if (!GET_PLAYER(ePlayer).isAlive())
- {
- return NULL;
- }
-
- CvPlot* pStartingPlot = GET_PLAYER(ePlayer).getStartingPlot();
- if (pStartingPlot != NULL)
- {
- if (!(pStartingPlot->isFreshWater()))
- {
- for (int iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
+ if (pStartingPlot != NULL)
{
- CvPlot* pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
-
- if (pLoopPlot != NULL)
+ if (!(pStartingPlot->isFreshWater()))
{
- if (!(pLoopPlot->isWater()))
+ for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
{
- if (!(pLoopPlot->isCoastalLand()))
+ pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
+
+ if (pLoopPlot != NULL)
{
- if (!(pLoopPlot->isRiver()))
+ if (!(pLoopPlot->isWater()))
{
- if (pLoopPlot->getBonusType() == NO_BONUS)
+ if (!(pLoopPlot->isCoastalLand()))
{
- bool bStartingPlot = false;
-
- for (int iK = 0; iK < MAX_CIV_PLAYERS; iK++)
+ if (!(pLoopPlot->isRiver()))
{
- if (GET_PLAYER((PlayerTypes)iK).isAlive())
+ if (pLoopPlot->getBonusType() == NO_BONUS)
{
- if (GET_PLAYER((PlayerTypes)iK).getStartingPlot() == pLoopPlot)
+ bStartingPlot = false;
+
+ for (iK = 0; iK < MAX_CIV_PLAYERS; iK++)
{
- bStartingPlot = true;
+ if (GET_PLAYER((PlayerTypes)iK).isAlive())
+ {
+ if (GET_PLAYER((PlayerTypes)iK).getStartingPlot() == pLoopPlot)
+ {
+ bStartingPlot = true;
+ break;
+ }
+ }
+ }
+
+ if (!bStartingPlot)
+ {
+ pLoopPlot->setPlotType(PLOT_OCEAN);
break;
}
}
}
-
- if (!bStartingPlot)
- {
- return pLoopPlot;
- }
}
}
}
@@ -1136,8 +1098,6 @@
}
}
}
-
- return NULL;
}
@@ -1172,43 +1132,7 @@
}
}
}
-
- int iX, iY;
- int iCityRange = CITY_PLOTS_RADIUS;
- int iExtraRange = 2;
- int iMaxRange = iCityRange + iExtraRange;
-
- for (iX = -iMaxRange; iX <= iMaxRange; iX++)
- {
- for (iY = -iMaxRange; iY <= iMaxRange; iY++)
- {
- pLoopPlot = plotXY(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iX, iY);
- if (pLoopPlot != NULL)
- {
- int iDistance = plotDistance(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE());
- if (iDistance <= iMaxRange)
- {
- if (pLoopPlot->getFeatureType() != NO_FEATURE)
- {
- if ((GC.getFeatureInfo(pLoopPlot->getFeatureType()).getYieldChange(YIELD_FOOD) <= 0) && (GC.getFeatureInfo(pLoopPlot->getFeatureType()).getYieldChange(YIELD_PRODUCTION) <= 0))
- {
- if (pLoopPlot->isWater())
- {
- if (pLoopPlot->isAdjacentToLand() || (!(iDistance == iMaxRange) && (getSorenRandNum(2, "Remove Bad Feature") == 0)))
- pLoopPlot->setFeatureType(NO_FEATURE);
- }
- else
- {
- if (!(iDistance == iMaxRange) && (getSorenRandNum((2 + (pLoopPlot->getBonusType() == NO_BONUS) ? 0 : 2), "Remove Bad Feature") == 0))
- pLoopPlot->setFeatureType(NO_FEATURE);
- }
- }
- }
- }
- }
- }
- }
- }
+ }
}
}
@@ -1217,19 +1141,8 @@
{
CvPlot* pStartingPlot;
CvPlot* pLoopPlot;
- int iI, iK;
- int iX, iY;
+ int iI, iJ, iK;
- int iTargetFood;
- int iTargetTotal;
- int iPlotFood;
- int iPlotProduction;
-
-
- int iCityRange = CITY_PLOTS_RADIUS;
- int iExtraRange = 1;
- int iMaxRange = iCityRange + iExtraRange;
-
for (iI = 0; iI < MAX_CIV_PLAYERS; iI++)
{
if (GET_PLAYER((PlayerTypes)iI).isAlive())
@@ -1238,57 +1151,32 @@
if (pStartingPlot != NULL)
{
- for (iX = -iMaxRange; iX <= iMaxRange; iX++)
- {
- for (iY = -iMaxRange; iY <= iMaxRange; iY++)
- {
- pLoopPlot = plotXY(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iX, iY);
- if (pLoopPlot != NULL)
- {
- int iDistance = plotDistance(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE());
- if (iDistance <= iMaxRange)
- {
- if (!(pLoopPlot->isWater()) && ((iDistance <= iCityRange) || (pLoopPlot->isCoastalLand()) || (0 == getSorenRandNum(1 + iDistance - iCityRange, "Map Upgrade Terrain Food"))))
- {
- iPlotFood = GC.getTerrainInfo(pLoopPlot->getTerrainType()).getYield(YIELD_FOOD);
- iPlotProduction = GC.getTerrainInfo(pLoopPlot->getTerrainType()).getYield(YIELD_PRODUCTION);
- if ((iPlotFood + iPlotProduction) <= 1)
- {
- iTargetFood = 1;
- iTargetTotal = 1;
- if (pLoopPlot->getBonusType(GET_PLAYER((PlayerTypes)iI).getTeam()) != NO_BONUS)
- {
- iTargetFood = 1;
- iTargetTotal = 2;
- }
- else if ((iPlotFood == 1) || (iDistance <= iCityRange))
- {
- iTargetFood = 1 + getSorenRandNum(2, "Map Upgrade Terrain Food");
- iTargetTotal = 2;
- }
- else
- {
- iTargetFood = pLoopPlot->isCoastalLand() ? 2 : 1;
- iTargetTotal = 2;
- }
+ for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
+ {
+ pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
- for (iK = 0; iK < GC.getNumTerrainInfos(); iK++)
- {
- if (!(GC.getTerrainInfo((TerrainTypes)iK).isWater()))
- {
- if ((GC.getTerrainInfo((TerrainTypes)iK).getYield(YIELD_FOOD) >= iTargetFood) &&
- (GC.getTerrainInfo((TerrainTypes)iK).getYield(YIELD_FOOD) + GC.getTerrainInfo((TerrainTypes)iK).getYield(YIELD_PRODUCTION)) == iTargetTotal)
- {
- if ((pLoopPlot->getFeatureType() == NO_FEATURE) || GC.getFeatureInfo(pLoopPlot->getFeatureType()).isTerrain(iK))
- pLoopPlot->setTerrainType((TerrainTypes)iK);
- }
- }
- }
- }
- }
- }
- }
- }
+ if (pLoopPlot != NULL)
+ {
+ if (!(pLoopPlot->isWater()))
+ {
+ if ((GC.getTerrainInfo(pLoopPlot->getTerrainType()).getYield(YIELD_FOOD) + GC.getTerrainInfo(pLoopPlot->getTerrainType()).getYield(YIELD_PRODUCTION)) <= 1)
+ {
+ for (iK = 0; iK < GC.getNumTerrainInfos(); iK++)
+ {
+ if (!(GC.getTerrainInfo((TerrainTypes)iK).isWater()))
+ {
+ if ((GC.getTerrainInfo((TerrainTypes)iK).getYield(YIELD_FOOD) + GC.getTerrainInfo((TerrainTypes)iK).getYield(YIELD_PRODUCTION)) > 1)
+ {
+ if ((pLoopPlot->getFeatureType() == NO_FEATURE) || GC.getFeatureInfo(pLoopPlot->getFeatureType()).isTerrain(iK))
+ {
+ pLoopPlot->setTerrainType((TerrainTypes)iK);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
@@ -1303,7 +1191,6 @@
BonusTypes eBonus;
bool bIgnoreLatitude;
int iFoodBonus;
- int iGoodNatureTileCount;
int iI, iJ, iK;
bIgnoreLatitude = false;
@@ -1318,7 +1205,6 @@
if (pStartingPlot != NULL)
{
iFoodBonus = 0;
- iGoodNatureTileCount = 0;
for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
{
@@ -1330,41 +1216,27 @@
if (eBonus != NO_BONUS)
{
- if (pLoopPlot->calculateBestNatureYield(YIELD_FOOD, GET_PLAYER((PlayerTypes)iI).getTeam()) >= 2)
- {
- iGoodNatureTileCount++;
- }
if (GC.getBonusInfo(eBonus).getYieldChange(YIELD_FOOD) > 0)
{
if ((GC.getBonusInfo(eBonus).getTechCityTrade() == NO_TECH) || (GC.getTechInfo((TechTypes)(GC.getBonusInfo(eBonus).getTechCityTrade())).getEra() <= getStartEra()))
{
if (pLoopPlot->isWater())
{
- iFoodBonus += 2;
+ iFoodBonus++;
}
else
{
- iFoodBonus += 3;
+ iFoodBonus += 2;
}
}
}
}
- else
- {
- if (pLoopPlot->calculateBestNatureYield(YIELD_FOOD, GET_PLAYER((PlayerTypes)iI).getTeam()) >= 3)
- {
- iGoodNatureTileCount++;
- }
- }
}
}
- int iTargetFoodBonusCount = 3;
- iTargetFoodBonusCount += (iGoodNatureTileCount == 0) ? 2 : 0;
-
for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
{
- if (iFoodBonus >= iTargetFoodBonusCount)
+ if (iFoodBonus >= 2)
{
break;
}
@@ -1392,11 +1264,11 @@
pLoopPlot->setBonusType((BonusTypes)iK);
if (pLoopPlot->isWater())
{
- iFoodBonus += 2;
+ iFoodBonus++;
}
else
{
- iFoodBonus += 3;
+ iFoodBonus += 2;
}
break;
}
@@ -1526,26 +1398,16 @@
CvPlot* pLoopPlot;
bool bIgnoreLatitude;
int iValue;
- int iTotalValue;
- int iBestValue;
- int iWorstValue;
+ int iMaxValue;
int iTargetValue;
int iCount;
int iPass;
- int iPlayerCount;
int iI, iJ, iK;
- int iOceanFoodCount;
- int iCoastFoodCount;
- bool bLandBias;
-
bIgnoreLatitude = false;
gDLL->getPythonIFace()->pythonIsBonusIgnoreLatitudes(&bIgnoreLatitude);
- iTotalValue = 0;
- iPlayerCount = 0;
- iBestValue = 0;
- iWorstValue = MAX_INT;
+ iMaxValue = 0;
for (iI = 0; iI < MAX_CIV_PLAYERS; iI++)
{
@@ -1556,19 +1418,14 @@
if (pStartingPlot != NULL)
{
iValue = GET_PLAYER((PlayerTypes)iI).AI_foundValue(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), -1, true);
- iTotalValue += iValue;
- iPlayerCount++;
- iBestValue = max(iValue, iBestValue);
- iWorstValue = min(iValue, iWorstValue);
-
+ iMaxValue = max(iMaxValue, iValue);
}
}
}
- iTargetValue = (iBestValue * 4) / 5;
+ iTargetValue = ((iMaxValue * 4) / 5);
-
for (iI = 0; iI < MAX_CIV_PLAYERS; iI++)
{
if (GET_PLAYER((PlayerTypes)iI).isAlive())
@@ -1578,8 +1435,7 @@
if (pStartingPlot != NULL)
{
- iCount = 0;
- int iFeatureCount = 0;
+ iCount = 0;
for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
{
@@ -1613,68 +1469,28 @@
}
}
}
-
- iFeatureCount += (pLoopPlot->getFeatureType() != NO_FEATURE) ? 1 : 0;
}
}
}
}
}
- iCoastFoodCount = 0;
- iOceanFoodCount = 0;
- int iWaterCount = 0;
+ iCount = 0;
+
for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
{
- pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
- if (pLoopPlot != NULL)
+ if (GET_PLAYER((PlayerTypes)iI).AI_foundValue(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), -1, true) >= iTargetValue)
{
- if (pLoopPlot != pStartingPlot)
- {
- iWaterCount++;
- if (pLoopPlot->isWater())
- {
- if (pLoopPlot->getBonusType() != NO_BONUS)
- {
- if (pLoopPlot->isAdjacentToLand())
- {
- iCoastFoodCount++;
- }
- else
- {
- iOceanFoodCount++;
- }
- }
- }
- }
+ break;
}
- }
- if (iWaterCount > NUM_CITY_PLOTS / 2)
- {
- bLandBias = true;
- }
+ if (getSorenRandNum(((iCount * 4) + 1), "Placing Bonuses") == 0)
+ {
+ pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
- iCount = 0;
-
- for (iJ = 0; iJ < NUM_CITY_PLOTS; iJ++)
- {
- pLoopPlot = plotCity(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), iJ);
-
- if ((pLoopPlot != NULL) && (pLoopPlot != pStartingPlot))
- {
- if (getSorenRandNum((((iCount * 3) + 1) * ((bLandBias && pLoopPlot->isWater()) ? 2 : 1)), "Placing Bonuses") == 0)
- {
- if (GET_PLAYER((PlayerTypes)iI).AI_foundValue(pStartingPlot->getX_INLINE(), pStartingPlot->getY_INLINE(), -1, true) >= iTargetValue)
- {
- break;
- }
-
- bool bCoast = (pLoopPlot->isWater() && pLoopPlot->isAdjacentToLand());
- bool bOcean = (pLoopPlot->isWater() && !bCoast);
- if ((pLoopPlot != pStartingPlot)
- && !(bCoast && (iCoastFoodCount > 2))
- && !(bOcean && (iOceanFoodCount > 2)))
+ if (pLoopPlot != NULL)
+ {
+ if (pLoopPlot != pStartingPlot)
{
for (iPass = 0; iPass < 2; iPass++)
{
@@ -1695,8 +1511,6 @@
{
pLoopPlot->setBonusType((BonusTypes)iK);
iCount++;
- iCoastFoodCount += bCoast ? 1 : 0;
- iOceanFoodCount += bOcean ? 1 : 0;
break;
}
}
@@ -1704,40 +1518,6 @@
}
}
}
-
- if (bLandBias && !(pLoopPlot->isWater()) && pLoopPlot->getBonusType() != NO_BONUS)
- {
- if (((iFeatureCount > 4) && (pLoopPlot->getFeatureType() != NO_FEATURE))
- && ((iCoastFoodCount + iOceanFoodCount) > 2))
- {
- pLoopPlot->setFeatureType(NO_FEATURE);
- if (getSorenRandNum(2, "Clear feature do add bonus") == 0)
- {
- for (iK = 0; iK < GC.getNumBonusInfos(); iK++)
- {
- if (GC.getBonusInfo((BonusTypes)iK).isNormalize())
- {
- //???no bonuses with negative yields?
- if ((GC.getBonusInfo((BonusTypes)iK).getYieldChange(YIELD_FOOD) >= 0) &&
- (GC.getBonusInfo((BonusTypes)iK).getYieldChange(YIELD_PRODUCTION) >= 0))
- {
- if ((GC.getBonusInfo((BonusTypes)iK).getTechCityTrade() == NO_TECH) || (GC.getTechInfo((TechTypes)(GC.getBonusInfo((BonusTypes)iK).getTechCityTrade())).getEra() <= getStartEra()))
- {
- if ((iPass == 0) ? CvMapGenerator::GetInstance().canPlaceBonusAt(((BonusTypes)iK), pLoopPlot->getX(), pLoopPlot->getY(), bIgnoreLatitude) : pLoopPlot->canHaveBonus(((BonusTypes)iK), bIgnoreLatitude))
- {
- pLoopPlot->setBonusType((BonusTypes)iK);
- iCount++;
- iCoastFoodCount += bCoast ? 1 : 0;
- iOceanFoodCount += bOcean ? 1 : 0;
- break;
- }
- }
- }
- }
- }
- }
- }
- }
}
}
}
@@ -2096,138 +1876,6 @@
}
else if (pHeadSelectedUnit != NULL)
{
-#ifdef ITS_FULL_OF_STARS
- // testing
- static bool bDrawVisibility = true;
- if (bDrawVisibility)
- {
- TeamTypes eTeam = pHeadSelectedUnit->getTeam();
- int iRange = pHeadSelectedUnit->visibilityRange();
-
- CvPlotDataRegion visiblePlotDataRegion;
- pHeadSelectedUnit->getGroup()->buildVisibilityRegion(visiblePlotDataRegion);
- for(CvPlotDataRegionIterator it = visiblePlotDataRegion.begin(); it != visiblePlotDataRegion.end(); it++)
- {
- XYCoords xy(getXYCoords(it));
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(xy.iX, xy.iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- CvPlotRegion visiblePlotRegion;
- pHeadSelectedUnit->getGroup()->buildVisibilityRegion(visiblePlotRegion);
- for(CvPlotRegionIterator it = visiblePlotRegion.begin(); it != visiblePlotRegion.end(); it++)
- {
- XYCoords xy(getXYCoords(it));
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(xy.iX, xy.iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_UNIT_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- /*CvPlotDataRegion visiblePlotRegion;
- pHeadSelectedUnit->getGroup()->buildVisibilityRegion(visiblePlotRegion);
- for(CvPlotDataRegionIterator it = visiblePlotRegion.begin(); it != visiblePlotRegion.end(); it++)
- {
- XYCoords xy(getXYCoords(it));
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(xy.iX, xy.iY);
- FAssert(pLoopPlot != NULL);
- CvUnitAI* pUnit = static_cast<CvUnitAI*>(pHeadSelectedUnit);
- if (pUnit->AI_fogbustPlotValue(pLoopPlot, getRegionValue(it)) > 0)
- {
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_UNIT_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
- }*/
-
- /*CvPlotDataRegion visibilityValues;
- pHeadSelectedUnit->plot()->addVisiblePlots(visibilityValues, iRange, 1, eTeam);
-
- if (pHeadSelectedUnit->getDomainType() == DOMAIN_LAND)
- {
- CvPlotDataRegion adjacentPlots;
- bool bIncludeOriginal = (pHeadSelectedUnit->getDomainType() == DOMAIN_AIR);
- int iRange = (pHeadSelectedUnit->getDomainType() == DOMAIN_LAND) ? 2 : 1;
- findAdjacentPlots(visibilityValues, adjacentPlots, bIncludeOriginal, iRange);
- for(CvPlotDataRegionIterator it = adjacentPlots.begin(); it != adjacentPlots.end(); it++)
- {
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(it->first.iX, it->first.iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_POSITIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- CvPlotDataRegion furtherAdjacentPlots;
- bIncludeOriginal = false;
- iRange = 1;
- findAdjacentPlots(adjacentPlots, furtherAdjacentPlots, bIncludeOriginal, iRange);
- for(CvPlotDataRegionIterator it = furtherAdjacentPlots.begin(); it != furtherAdjacentPlots.end(); it++)
- {
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(it->first.iX, it->first.iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
- }
- else
- {
- CvPlotRegion adjacentPlots;
- bool bIncludeOriginal = (pHeadSelectedUnit->getDomainType() == DOMAIN_AIR);
- int iRange = (pHeadSelectedUnit->getDomainType() == DOMAIN_LAND) ? 2 : 1;
- findAdjacentPlots(visiblePlotRegion, adjacentPlots, bIncludeOriginal, iRange);
- for(CvPlotRegionIterator it = adjacentPlots.begin(); it != adjacentPlots.end(); it++)
- {
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(it->iX, it->iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_POSITIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- CvPlotRegion furtherAdjacentPlots;
- bIncludeOriginal = false;
- iRange = 1;
- findAdjacentPlots(adjacentPlots, furtherAdjacentPlots, bIncludeOriginal, iRange);
- for(CvPlotRegionIterator it = furtherAdjacentPlots.begin(); it != furtherAdjacentPlots.end(); it++)
- {
- CvPlot* pLoopPlot = GC.getMapINLINE().plotSorenINLINE(it->iX, it->iY);
- FAssert(pLoopPlot != NULL);
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- }*/
-
- //CLinkList<CvPlot*> visiblePlotList;
- //pHeadSelectedUnit->plot()->getVisiblePlotsList(visiblePlotList, eTeam, iRange);
- /*for (CLLNode<CvPlot*>* pNode = visiblePlotList.head(); (pNode != NULL); pNode = visiblePlotList.next(pNode))
- {
- CvPlot* pLoopPlot = pNode->m_data;
- CvPlotDataRegionIterator itValue = visibilityValues.find(XYCoords(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE()));
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString(itValue != visibilityValues.end() ? "COLOR_UNIT_TEXT" : "COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }*/
-
- //// check size
- //FAssert(visiblePlotList.getLength() == visiblePlotRegion.size());
-
- //// compare
- //for (CLLNode<CvPlot*>* pNode = visiblePlotList.head(); (pNode != NULL); pNode = visiblePlotList.next(pNode))
- //{
- // CvPlotRegionIterator itPlot = visiblePlotRegion.find(XYCoords(pNode->m_data->getX_INLINE(), pNode->m_data->getY_INLINE()));
- // FAssert(itPlot != visiblePlotRegion.end());
- //}
-
- /*CLinkList<CvPlot*> furtherPlotList;
- pHeadSelectedUnit->plot()->getVisiblePlotsList(furtherPlotList, eTeam, iRange + 2, &visiblePlotList);
- for (CLLNode<CvPlot*>* pNode = furtherPlotList.head(); (pNode != NULL); pNode = furtherPlotList.next(pNode))
- {
- CvPlot* pLoopPlot = pNode->m_data;
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
- pHeadSelectedUnit->plot()->getVisiblePlotsList(furtherPlotList, eTeam, iRange + 1, &visiblePlotList);
- for (CLLNode<CvPlot*>* pNode = furtherPlotList.head(); (pNode != NULL); pNode = furtherPlotList.next(pNode))
- {
- CvPlot* pLoopPlot = pNode->m_data;
- gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_POSITIVE_TEXT")).getColor(), PLOT_STYLE_BOX_OUTLINE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }*/
-
- }
-#endif
-
if (gDLL->getGraphicOption(GRAPHICOPTION_CITY_RADIUS))
{
if (gDLL->getInterfaceIFace()->canSelectionListFound())
@@ -2292,8 +1940,6 @@
if (!(GET_PLAYER(getActivePlayer()).isOption(PLAYEROPTION_NO_UNIT_RECOMMENDATIONS)))
{
- bool bFoundRecommendation = false;
-
if ((pHeadSelectedUnit->AI_getUnitAIType() == UNITAI_WORKER) || (pHeadSelectedUnit->AI_getUnitAIType() == UNITAI_WORKER_SEA))
{
if (pHeadSelectedUnit->plot()->getOwnerINLINE() == pHeadSelectedUnit->getOwnerINLINE())
@@ -2304,8 +1950,6 @@
{
if (pHeadSelectedUnit->AI_bestCityBuild(pCity, &pBestPlot))
{
- bFoundRecommendation = true;
-
FAssert(pBestPlot != NULL);
gDLL->getEngineIFace()->addColoredPlot(pBestPlot->getX_INLINE(), pBestPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_HIGHLIGHT_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
@@ -2339,7 +1983,6 @@
{
if (pLoopPlot->isBestAdjacentFound(pHeadSelectedUnit->getOwnerINLINE()))
{
- bFoundRecommendation = true;
gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_HIGHLIGHT_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
}
}
@@ -2348,7 +1991,6 @@
{
if (pLoopPlot->isRevealedGoody(pHeadSelectedUnit->getTeam()))
{
- bFoundRecommendation = true;
gDLL->getEngineIFace()->addColoredPlot(pLoopPlot->getX_INLINE(), pLoopPlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_HIGHLIGHT_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
}
}
@@ -2358,33 +2000,6 @@
}
}
}
-
-#ifdef GIVE_EXPLORER_SUGGESTIONS
- if (!bFoundRecommendation && (pHeadSelectedUnit->isNoBadGoodies() || pHeadSelectedUnit->getDomainType() == DOMAIN_SEA))
- {
- CvPlot* pBestExplorePlotThisTurn = NULL;
- CvPlot* pBestExplorePlot = pHeadSelectedUnit->AI_getBestExplorePlot((pHeadSelectedUnit->getDomainType() == DOMAIN_SEA) ? 4 : 3, &pBestExplorePlotThisTurn, /*bNoRandom*/ true);
- if (pBestExplorePlotThisTurn != NULL)
- {
- if (pBestExplorePlotThisTurn != pHeadSelectedUnit->plot())
- {
- gDLL->getEngineIFace()->addColoredPlot(pBestExplorePlotThisTurn->getX_INLINE(), pBestExplorePlotThisTurn->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_HIGHLIGHT_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
- else if (pBestExplorePlot != NULL && pBestExplorePlotThisTurn != pBestExplorePlot)
- {
- gDLL->getEngineIFace()->addColoredPlot(pBestExplorePlot->getX_INLINE(), pBestExplorePlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_HIGHLIGHT_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-
-#ifdef FASSERT_ENABLE
- if (pBestExplorePlot != NULL && pBestExplorePlotThisTurn != pBestExplorePlot)
- {
- gDLL->getEngineIFace()->addColoredPlot(pBestExplorePlot->getX_INLINE(), pBestExplorePlot->getY_INLINE(), GC.getColorInfo((ColorTypes)GC.getInfoTypeForString("COLOR_NEGATIVE_TEXT")).getColor(), PLOT_STYLE_CIRCLE, PLOT_LANDSCAPE_LAYER_RECOMMENDED_PLOTS);
- }
-#endif
- }
- }
-#endif
-
}
}
}
@@ -4022,40 +3637,6 @@
FAssertMsg(eOtherWho != NO_PLAYER, "OtherWho is not assigned a valid value");
FAssertMsg(eWho != eOtherWho, "eWho is not expected to be equal with eOtherWho");
- // if debug mode (ctrl-z under chipotle), then notify the human that a deal was made
- if (GC.getGameINLINE().isDebugMode())
- {
- FAssertMsg(((pOurList->getLength() > 0) || (pTheirList->getLength() > 0)), "Empty trade implemented?!");
-
- PlayerTypes iActivePlayer = GC.getGameINLINE().getActivePlayer();
-
- if (iActivePlayer != eWho && iActivePlayer != eOtherWho)
- {
- bool bReportTrade = true;
-
- // special check for the triple open borders issue
- CLLNode<TradeData>* pNode = pOurList->head();
- if (pNode != NULL)
- {
- if (pNode->m_data.m_eItemType == TRADE_OPEN_BORDERS && pNode->m_data.m_iData != 0)
- {
- bReportTrade = false;
- }
- }
-
- if (bReportTrade)
- {
- CvWString szString;
- CvWString szDealString;
-
- szDealString.clear();
- // TODO Fix GAMETEXT.getDealString(szDealString, eWho, eOtherWho, pOurList, pTheirList, iActivePlayer);
- szString.Format(L"%s", szDealString.GetCString());
- gDLL->getInterfaceIFace()->addMessage(iActivePlayer, true, GC.getDefineINT("EVENT_MESSAGE_TIME"), szString);
- }
- }
- }
-
pDeal = addDeal();
pDeal->init(pDeal->getID(), eWho, eOtherWho);
pDeal->addTrades(pOurList, pTheirList, !bForce);
@@ -4251,10 +3832,10 @@
{
if (getPlayerVote(((PlayerTypes)iI), eVote) == iChoice)
{
- // < TraitVotes by Impaler[WrG] Start >
+ // StartChange TraitVotes by Impaler[WrG]
// ORIGINAL CODE iCount += (GET_PLAYER((PlayerTypes)iI).getTotalPopulation() * GET_PLAYER((PlayerTypes)iI).getVoteModifier() /100);
iCount += ((GET_PLAYER((PlayerTypes)iI).getTotalPopulation() * GET_PLAYER((PlayerTypes)iI).getVoteModifier()) /100);
- // < TraitVotes End >
+ // End Change
}
}
}
@@ -4274,10 +3855,10 @@
{
if (GET_PLAYER((PlayerTypes)iI).isAlive())
{
- // < TraitVotes by Impaler[WrG] Start >
+ // Start Change TraitVotes by Impaler[WrG]
// ORIGINAL CODE iCount += GET_PLAYER((PlayerTypes)iI).getTotalPopulation();
iCount += ((GET_PLAYER((PlayerTypes)iI).getTotalPopulation() * GET_PLAYER((PlayerTypes)iI).getVoteModifier()) /100);
- // < TraitVotes End >
+ // End Change
}
}
@@ -5357,7 +4938,7 @@
{
m_iAIAutoPlay = max(0, iNewValue);
- // < AI Autoplay by jdog5000 Start >
+// ---------------- AI_AUTO_PLAY_MOD start (2006-07-04)-------------------
/* ORIGINAL
if ((iOldValue == 0) && (getAIAutoPlay() > 0))
{
@@ -5366,7 +4947,7 @@
}
ORIGINAL */
GET_PLAYER(getActivePlayer()).setDisableHuman((getAIAutoPlay() != 0));
- // < AI Autoplay End >
+// ---------------- AI_AUTO_PLAY_MOD end ---------------------------------
}
}
@@ -5375,9 +4956,9 @@
{
setAIAutoPlay(getAIAutoPlay() + iChange);
- // < AI Autoplay by jdog5000 Start >
+// ---------------- AI_AUTO_PLAY_MOD start (2006-07-04)-------------------
GET_PLAYER(getActivePlayer()).setDisableHuman((getAIAutoPlay() != 0));
- // < AI Autoplay End >
+// ---------------- AI_AUTO_PLAY_MOD end ---------------------------------
}
@@ -7449,9 +7030,9 @@
int iLoop;
int iI, iJ, iK;
- bool bSkip; // < Mastery Victory by Sevo >
- int iL, iM, winningTeam, topScore, score; // < Mastery Victory by Sevo >
- CvWString szBuffer; // < Mastery Victory by Sevo >
+ bool bSkip; // Mastery Victory by Sevo
+ int iL, iM, winningTeam, topScore, score; // Mastery Victory by Sevo
+ CvWString szBuffer; // Mastery Victory by Sevo
if (getVictory() != NO_VICTORY)
{
@@ -7474,8 +7055,9 @@
bEndScore = false;
- // < Mastery Victory by Sevo Start >
+ // Start Mastery Victory by Sevo
// I'm doing a separate loop here because this victory condition is so different from the rest.
+
bSkip = false;
topScore = 0;
winningTeam = -1;
@@ -7575,7 +7157,7 @@
// This creates a conditional for the main loop; we skip it if we're in total victory mode
if (bSkip == false)
{
- // < Mastery Victory End >
+ // End Mastery Victory by Sevo
for (iI = 0; iI < MAX_CIV_TEAMS; iI++)
{
@@ -8092,143 +7674,6 @@
}
}
-#ifdef DEBUG_OUT_OF_SYNCS
- if (GC.getLogging())
- {
- TCHAR szOut[1024];
- sprintf(szOut, "SyncChecksum = %d on %d\n", iValue, GC.getGameINLINE().getTurnSlice());
- gDLL->messageControlLog(szOut);
-
- sprintf(szOut, "m=%d, s=%d, c=%d, p=%d, d=%d, o=%d, a=%d\n",
- getMapRand().getSeed(),
- getSorenRand().getSeed(),
- getNumCities(),
- getTotalPopulation(),
- getNumDeals(),
- GC.getMapINLINE().getOwnedPlots(),
- GC.getMapINLINE().getNumAreas());
- gDLL->messageControlLog(szOut);
-
- sprintf(szOut, "m=%d, s=%d, c=%d, p=%d, d=%d, o=%d, a=%d\n",
- getMapRand().getSeed(),
- getSorenRand().getSeed(),
- getNumCities(),
- getTotalPopulation(),
- getNumDeals(),
- GC.getMapINLINE().getOwnedPlots(),
- GC.getMapINLINE().getNumAreas());
- gDLL->messageControlLog(szOut);
-
- for (iI = 0; iI < MAX_PLAYERS; iI++)
- {
- if (GET_PLAYER((PlayerTypes)iI).isEverAlive())
- {
- sprintf(szOut, "%S: s=%d, p=%d, L=%d, g=%d, a=%d, pw=%d, c=%d, u=%d, sg=%d\n",
- GET_PLAYER((PlayerTypes)iI).getName(),
- getPlayerScore((PlayerTypes)iI),
- GET_PLAYER((PlayerTypes)iI).getTotalPopulation(),
- GET_PLAYER((PlayerTypes)iI).getTotalLand(),
- GET_PLAYER((PlayerTypes)iI).getGold(),
- GET_PLAYER((PlayerTypes)iI).getAssets(),
- GET_PLAYER((PlayerTypes)iI).getPower(),
- GET_PLAYER((PlayerTypes)iI).getNumCities(),
- GET_PLAYER((PlayerTypes)iI).getNumUnits(),
- GET_PLAYER((PlayerTypes)iI).getNumSelectionGroups());
- gDLL->messageControlLog(szOut);
-
- sprintf(szOut, " yield: f=%d, p=%d, c=%d; commerce: g=%d, r=%d, c=%d\n",
- GET_PLAYER((PlayerTypes)iI).calculateTotalYield(YIELD_FOOD),
- GET_PLAYER((PlayerTypes)iI).calculateTotalYield(YIELD_PRODUCTION),
- GET_PLAYER((PlayerTypes)iI).calculateTotalYield(YIELD_COMMERCE),
- GET_PLAYER((PlayerTypes)iI).getCommerceRate(COMMERCE_GOLD),
- GET_PLAYER((PlayerTypes)iI).getCommerceRate(COMMERCE_RESEARCH),
- GET_PLAYER((PlayerTypes)iI).getCommerceRate(COMMERCE_CULTURE));
- gDLL->messageControlLog(szOut);
-
- sprintf(szOut, " bonuses: ");
- gDLL->messageControlLog(szOut);
- for (iJ = 0; iJ < GC.getNumBonusInfos(); iJ++)
- {
- int iAvailableBonuses = GET_PLAYER((PlayerTypes)iI).getNumAvailableBonuses((BonusTypes)iJ);
- int iBonusImport = GET_PLAYER((PlayerTypes)iI).getBonusImport((BonusTypes)iJ);
- int iBonusExport = GET_PLAYER((PlayerTypes)iI).getBonusExport((BonusTypes)iJ);
-
- if (iAvailableBonuses != 0 || iBonusImport != 0 || iBonusExport != 0)
- {
- sprintf(szOut, "%S: f=%d, p=%d, c=%d; ", GC.getBonusInfo((BonusTypes)iJ).getDescription(), iAvailableBonuses, iBonusImport, iBonusExport);
- gDLL->messageControlLog(szOut);
- }
- }
-
- sprintf(szOut, "\n imrovements: ");
- gDLL->messageControlLog(szOut);
- for (iJ = 0; iJ < GC.getNumImprovementInfos(); iJ++)
- {
- int iImprovementCount = GET_PLAYER((PlayerTypes)iI).getImprovementCount((ImprovementTypes)iJ);
- if (iImprovementCount != 0)
- {
- sprintf(szOut, "%S=%d, ", GC.getImprovementInfo((ImprovementTypes)iJ).getDescription(), iImprovementCount);
- gDLL->messageControlLog(szOut);
- }
- }
-
- sprintf(szOut, "\n buildings: ");
- gDLL->messageControlLog(szOut);
- for (iJ = 0; iJ < GC.getNumBuildingClassInfos(); iJ++)
- {
- int iBuildingCount = GET_PLAYER((PlayerTypes)iI).getBuildingClassCountPlusMaking((BuildingClassTypes)iJ);
- if (iBuildingCount != 0)
- {
- sprintf(szOut, "%S=%d, ", GC.getBuildingClassInfo((BuildingClassTypes)iJ).getDescription(), iBuildingCount);
- gDLL->messageControlLog(szOut);
- }
- }
-
- sprintf(szOut, "\n unitclasses: ");
- gDLL->messageControlLog(szOut);
- for (iJ = 0; iJ < GC.getNumUnitClassInfos(); iJ++)
- {
- int iUnitCount = GET_PLAYER((PlayerTypes)iI).getUnitClassCountPlusMaking((UnitClassTypes)iJ);
- if (iUnitCount != 0)
- {
- sprintf(szOut, "%S=%d, ", GC.getUnitClassInfo((UnitClassTypes)iJ).getDescription(), iUnitCount);
- gDLL->messageControlLog(szOut);
- }
- }
-
- sprintf(szOut, "\n unitais: ");
- gDLL->messageControlLog(szOut);
- for (iJ = 0; iJ < NUM_UNITAI_TYPES; iJ++)
- {
- int iUnitAICount = GET_PLAYER((PlayerTypes)iI).AI_totalUnitAIs((UnitAITypes)iJ);
- if (iUnitAICount != 0)
- {
- sprintf(szOut, "%S=%d, ", GC.getUnitAIInfo((UnitAITypes)iJ).getDescription(), iUnitAICount);
- gDLL->messageControlLog(szOut);
- }
- }
-
- sprintf(szOut, "\n units: ");
- gDLL->messageControlLog(szOut);
- for (pLoopUnit = GET_PLAYER((PlayerTypes)iI).firstUnit(&iLoop); pLoopUnit != NULL; pLoopUnit = GET_PLAYER((PlayerTypes)iI).nextUnit(&iLoop))
- {
- sprintf(szOut, "%S(%d,%d), d=%d, %dexp, l=%d; ",
- pLoopUnit->getName().GetCString(),
- pLoopUnit->getX_INLINE(),
- pLoopUnit->getY_INLINE(),
- pLoopUnit->getDamage(),
- pLoopUnit->getExperience(),
- pLoopUnit->getLevel());
- gDLL->messageControlLog(szOut);
- }
-
- sprintf(szOut, "\n\n");
- gDLL->messageControlLog(szOut);
- }
- }
- }
-#endif
-
return iValue;
}
@@ -8551,12 +7996,6 @@
pStream->Read(MAX_PLAYERS, starshipLaunched); // Mastery Victory by Sevo
pStream->Read(MAX_PLAYERS, diplomaticVictoryAchieved); // Mastery Victory by Sevo
-
- // < Inquisition Mod by Lopez Start >
- pStream->Read(&m_bRequireStateReligionForReligionRemoval);
- pStream->Read(&m_bRequireCityOwnerStateReligionMatchForReligionRemoval);
- pStream->Read(&m_bRequireOpenBordersForReligionRemoval);
- // < Inquisition Mod End >
}
@@ -8683,12 +8122,6 @@
pStream->Write(MAX_PLAYERS, starshipLaunched); // Mastery Victory by Sevo
pStream->Write(MAX_PLAYERS, diplomaticVictoryAchieved); // Mastery Victory by Sevo
-
- // < Inquisition Mod by Lopez Start >
- pStream->Write(m_bRequireStateReligionForReligionRemoval);
- pStream->Write(m_bRequireCityOwnerStateReligionMatchForReligionRemoval);
- pStream->Write(m_bRequireOpenBordersForReligionRemoval);
- // < Inquisition Mod End >
}
void CvGame::writeReplay(FDataStreamBase& stream, PlayerTypes ePlayer)
@@ -8821,7 +8254,7 @@
//--------------------------CCCP NEW--------------------------
-// < Revolution Mod by jdog5000 Start >
+// ---------------- REVOLUTION_MOD start ---------------------
#include "CvDLLFlagEntityIFaceBase.h"
// Return success of creating new player at index playerIdx (must be dead or empty player)
@@ -9231,182 +8664,14 @@
break;
}
}
-// < Revolution Mod End >
+// ---------------- REVOLUTION_MOD end -----------------------
-bool CvGame::getStarshipLaunched(int ID) // < Mastery Victory by Sevo >
+bool CvGame::getStarshipLaunched(int ID) // Mastery Victory by Sevo
{
return starshipLaunched[ID];
}
-bool CvGame::getDiplomaticVictoryAchieved(int ID) // < Mastery Victory by Sevo >
+bool CvGame::getDiplomaticVictoryAchieved(int ID) // Mastery Victory by Sevo
{
return diplomaticVictoryAchieved[ID];
-}
-
-// < Shrine Functions by ??? Start >
-int CvGame::getShrineBuildingCount(ReligionTypes eReligion)
-{
- int iShrineBuildingCount = 0;
-
- if (eReligion == NO_RELIGION)
- iShrineBuildingCount = m_iShrineBuildingCount;
- else for (int iI = 0; iI < m_iShrineBuildingCount; iI++)
- if (m_aiShrineReligion[iI] == eReligion)
- iShrineBuildingCount++;
-
- return iShrineBuildingCount;
-}
-
-BuildingTypes CvGame::getShrineBuilding(int eIndex, ReligionTypes eReligion)
-{
- FAssertMsg(eIndex >= 0 && eIndex < m_iShrineBuildingCount, "invalid index to CvGame::getShrineBuilding");
-
- BuildingTypes eBuilding = NO_BUILDING;
-
- if (eIndex >= 0 && eIndex < m_iShrineBuildingCount)
- {
- if (eReligion == NO_RELIGION)
- eBuilding = (BuildingTypes) m_aiShrineBuilding[eIndex];
- else for (int iI = 0, iReligiousBuilding = 0; iI < m_iShrineBuildingCount; iI++)
- if (m_aiShrineReligion[iI] == (int) eReligion)
- {
- if (iReligiousBuilding == eIndex)
- {
- // found it
- eBuilding = (BuildingTypes) m_aiShrineBuilding[iI];
- break;
- }
-
- iReligiousBuilding++;
- }
- }
-
- return eBuilding;
-}
-
-void CvGame::changeShrineBuilding(BuildingTypes eBuilding, ReligionTypes eReligion, bool bRemove)
-{
- FAssertMsg(eBuilding >= 0 && eBuilding < GC.getNumBuildingInfos(), "invalid index to CvGame::changeShrineBuilding");
- FAssertMsg(bRemove || m_iShrineBuildingCount < GC.getNumBuildingInfos(), "trying to add too many buildings to CvGame::changeShrineBuilding");
-
- if (bRemove)
- {
- bool bFound = false;
-
- for (int iI = 0; iI < m_iShrineBuildingCount; iI++)
- {
- if (!bFound)
- {
- // note, eReligion is not important if we removing, since each building is always one religion
- if (m_aiShrineBuilding[iI] == (int) eBuilding)
- bFound = true;
- }
-
- if (bFound)
- {
- int iToMove = iI + 1;
- if (iToMove < m_iShrineBuildingCount)
- {
- m_aiShrineBuilding[iI] = m_aiShrineBuilding[iToMove];
- m_aiShrineReligion[iI] = m_aiShrineReligion[iToMove];
- }
- else
- {
- m_aiShrineBuilding[iI] = (int) NO_BUILDING;
- m_aiShrineReligion[iI] = (int) NO_RELIGION;
- }
- }
-
- if (bFound)
- m_iShrineBuildingCount--;
-
- }
- }
- else if (m_iShrineBuildingCount < GC.getNumBuildingInfos())
- {
- // add this item to the end
- m_aiShrineBuilding[m_iShrineBuildingCount] = eBuilding;
- m_aiShrineReligion[m_iShrineBuildingCount] = eReligion;
- m_iShrineBuildingCount++;
- }
-
-}
-
-bool CvGame::culturalVictoryValid()
-{
- if (m_iNumCultureVictoryCities > 0)
- {
- return true;
- }
-
- return false;
-}
-
-int CvGame::culturalVictoryNumCultureCities()
-{
- return m_iNumCultureVictoryCities;
-}
-
-CultureLevelTypes CvGame::culturalVictoryCultureLevel()
-{
- if (m_iNumCultureVictoryCities > 0)
- {
- return (CultureLevelTypes) m_eCultureVictoryCultureLevel;
- }
-
- return NO_CULTURELEVEL;
-}
-
-// < Inquisition Mod by Lopez Start >
-bool CvGame::isRequireStateReligionForReligionRemoval() const
-{
- return m_bRequireStateReligionForReligionRemoval;
-}
-
-void CvGame::setRequireStateReligionForReligionRemoval(bool bNewValue)
-{
- m_bRequireStateReligionForReligionRemoval = bNewValue;
-}
-
-bool CvGame::isRequireCityOwnerStateReligionMatchForReligionRemoval() const
-{
- return m_bRequireCityOwnerStateReligionMatchForReligionRemoval;
-}
-
-void CvGame::setRequireCityOwnerStateReligionMatchForReligionRemoval(bool bNewValue)
-{
- m_bRequireCityOwnerStateReligionMatchForReligionRemoval = bNewValue;
-}
-
-bool CvGame::isRequireOpenBordersForReligionRemoval() const
-{
- return m_bRequireOpenBordersForReligionRemoval;
-}
-
-void CvGame::setRequireOpenBordersForReligionRemoval(bool bNewValue)
-{
- m_bRequireOpenBordersForReligionRemoval = bNewValue;
-}
-// < Inquisition Mod End >
-
-
-bool CvGame::circumnavigationAvailable() const // < Circumnavigation by ??? >
-{
- if (isCircumnavigated())
- return false;
-
- if (GC.getDefineINT("CIRCUMNAVIGATE_FREE_MOVES") == 0)
- return false;
-
- CvMap& kMap = GC.getMapINLINE();
-
- if (!(kMap.isWrapXINLINE()) && !(kMap.isWrapYINLINE()))
- return false;
-
- if (kMap.getLandPlots() > ((kMap.numPlotsINLINE() * 2) / 3))
- return false;
-
- return true;
-}
- //return diplomaticVictoryAchieved[ID];
-
+}
\ No newline at end of file
Modified: CvGameCoreDLL/CvGameCoreDLL.depend
===================================================================
--- CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 20:28:42 UTC (rev 36)
+++ CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:10:13 UTC (rev 37)
@@ -26818,3 +26818,5446 @@
"CvGameTextMgr.h"
"CvGameCoreUtils.h"
+1173731815 c:\sdk\cccp dll\cvarea.cpp
+ "CvGameCoreDLL.h"
+ "CvArea.h"
+ "CvMap.h"
+ "CvPlot.h"
+ "CvGlobals.h"
+ "CvGameAI.h"
+ "CvPlayerAI.h"
+ "CvTeamAI.h"
+ "CvGameCoreUtils.h"
+ "CvInfos.h"
+ "CvDLLInterfaceIFaceBase.h"
+
+1173731816 c:\sdk\cccp dll\cvgamecoredll.h
+ <windows.h>
+ <MMSystem.h>
+ <crtdbg.h>
+ <vector>
+ <list>
+ <tchar.h>
+ <math.h>
+ <assert.h>
+ <map>
+ <hash_map>
+ <boost/python/list.hpp>
+ <boost/python/tuple.hpp>
+ <boost/python/class.hpp>
+ <boost/python/manage_new_object.hpp>
+ <boost/python/return_value_policy.hpp>
+ <boost/python/object.hpp>
+ <boost/python/def.hpp>
+ "FAssert.h"
+ "CvGameCoreDLLDefNew.h"
+ "FDataStreamBase.h"
+ "FFreeListArrayBase.h"
+ "FFreeListTrashArray.h"
+ "FFreeListArray.h"
+ "CvString.h"
+ "CvEnums.h"
+ "CvStructs.h"
+ "CvDLLUtilityIFaceBase.h"
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\list.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/python/object.hpp>
+ <boost/python/converter/pytype_object_mgr_traits.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\detail\prefix.hpp
+ <boost/python/detail/wrap_python.hpp>
+ <boost/python/detail/config.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\detail\wrap_python.hpp
+ <pyconfig.h>
+ <limits.h>
+ <patchlevel.h>
+ <stdio.h>
+ <boost/python/detail/python22_fixed.h>
+ <Python.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\pyconfig.h
+ <io.h>
+ <float.h>
+ <basetsd.h>
+ <io.h>
+ <stdio.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\patchlevel.h
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\detail\python22_fixed.h
+ "patchlevel.h"
+ "pyconfig.h"
+ <limits.h>
+ <stdio.h>
+ <string.h>
+ <errno.h>
+ <stdlib.h>
+ <unistd.h>
+ <assert.h>
+ "pyport.h"
+ "pymem.h"
+ "object.h"
+ "objimpl.h"
+ "pydebug.h"
+ "unicodeobject.h"
+ "intobject.h"
+ "longobject.h"
+ "floatobject.h"
+ "complexobject.h"
+ "rangeobject.h"
+ "stringobject.h"
+ "bufferobject.h"
+ "tupleobject.h"
+ "listobject.h"
+ "dictobject.h"
+ "methodobject.h"
+ "moduleobject.h"
+ "funcobject.h"
+ "classobject.h"
+ "fileobject.h"
+ "cobject.h"
+ "traceback.h"
+ "sliceobject.h"
+ "cellobject.h"
+ "iterobject.h"
+ "descrobject.h"
+ "weakrefobject.h"
+ "codecs.h"
+ "pyerrors.h"
+ "pystate.h"
+ "modsupport.h"
+ "pythonrun.h"
+ "ceval.h"
+ "sysmodule.h"
+ "intrcheck.h"
+ "import.h"
+ "abstract.h"
+ "pyfpe.h"
+ <pth.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\pyport.h
+ "pyconfig.h"
+ <stdlib.h>
+ <math.h>
+ <sys/time.h>
+ <time.h>
+ <sys/time.h>
+ <time.h>
+ <sys/select.h>
+ <sys/types.h>
+ "unixstuff.h"
+ <sys/types.h>
+ <sys/stat.h>
+ <stat.h>
+ <sys/types.h>
+ <termios.h>
+ <osreldate.h>
+ <ctype.h>
+ <wctype.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\pymem.h
+ "pyport.h"
+
+1149109652 c:\sdk\cccp dll\python24\include\object.h
+
+1149109652 c:\sdk\cccp dll\python24\include\objimpl.h
+ "pymem.h"
+
+1149109652 c:\sdk\cccp dll\python24\include\pydebug.h
+
+1149109652 c:\sdk\cccp dll\python24\include\unicodeobject.h
+ <ctype.h>
+ <time.h>
+ <wchar.h>
+ <wctype.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\intobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\longobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\floatobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\complexobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\rangeobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\stringobject.h
+ <stdarg.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\bufferobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\tupleobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\listobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\dictobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\methodobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\moduleobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\funcobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\classobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\fileobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\cobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\traceback.h
+
+1149109652 c:\sdk\cccp dll\python24\include\sliceobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\cellobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\iterobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\descrobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\weakrefobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\codecs.h
+
+1149109652 c:\sdk\cccp dll\python24\include\pyerrors.h
+ <stdarg.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\pystate.h
+
+1149109652 c:\sdk\cccp dll\python24\include\modsupport.h
+ <stdarg.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\pythonrun.h
+
+1149109652 c:\sdk\cccp dll\python24\include\ceval.h
+
+1149109652 c:\sdk\cccp dll\python24\include\sysmodule.h
+
+1149109652 c:\sdk\cccp dll\python24\include\intrcheck.h
+
+1149109652 c:\sdk\cccp dll\python24\include\import.h
+
+1149109652 c:\sdk\cccp dll\python24\include\abstract.h
+
+1149109652 c:\sdk\cccp dll\python24\include\pyfpe.h
+ <signal.h>
+ <setjmp.h>
+ <math.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\python.h
+ "patchlevel.h"
+ "pyconfig.h"
+ <limits.h>
+ <stdio.h>
+ <string.h>
+ <errno.h>
+ <stdlib.h>
+ <unistd.h>
+ <stddef.h>
+ <assert.h>
+ "pyport.h"
+ "pymem.h"
+ "object.h"
+ "objimpl.h"
+ "pydebug.h"
+ "unicodeobject.h"
+ "intobject.h"
+ "boolobject.h"
+ "longobject.h"
+ "floatobject.h"
+ "complexobject.h"
+ "rangeobject.h"
+ "stringobject.h"
+ "bufferobject.h"
+ "tupleobject.h"
+ "listobject.h"
+ "dictobject.h"
+ "enumobject.h"
+ "setobject.h"
+ "methodobject.h"
+ "moduleobject.h"
+ "funcobject.h"
+ "classobject.h"
+ "fileobject.h"
+ "cobject.h"
+ "traceback.h"
+ "sliceobject.h"
+ "cellobject.h"
+ "iterobject.h"
+ "genobject.h"
+ "descrobject.h"
+ "weakrefobject.h"
+ "codecs.h"
+ "pyerrors.h"
+ "pystate.h"
+ "modsupport.h"
+ "pythonrun.h"
+ "ceval.h"
+ "sysmodule.h"
+ "intrcheck.h"
+ "import.h"
+ "abstract.h"
+ "compile.h"
+ "eval.h"
+ "pystrtod.h"
+ "pyfpe.h"
+ <pth.h>
+
+1149109652 c:\sdk\cccp dll\python24\include\boolobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\enumobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\setobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\genobject.h
+
+1149109652 c:\sdk\cccp dll\python24\include\compile.h
+
+1149109652 c:\sdk\cccp dll\python24\include\eval.h
+
+1149109652 c:\sdk\cccp dll\python24\include\pystrtod.h
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\detail\config.hpp
+ <boost/config.hpp>
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config.hpp
+ <boost/config/select_compiler_config.hpp>
+ <boost/config/select_stdlib_config.hpp>
+ <boost/config/select_platform_config.hpp>
+ <boost/config/suffix.hpp>
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config\select_compiler_config.hpp
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config\select_stdlib_config.hpp
+ <utility>
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config\select_platform_config.hpp
+ <boost/config/posix_features.hpp>
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config\posix_features.hpp
+ <unistd.h>
+
+1149109614 c:\sdk\cccp dll\boost-1.32.0\include\boost\config\suffix.hpp
+ <limits.h>
+ <cstddef>
+ "boost/type.hpp"
+ "boost/non_type.hpp"
+
+1149109640 c:\sdk\cccp dll\boost-1.32.0\include\boost\type.hpp
+
+1149109630 c:\sdk\cccp dll\boost-1.32.0\include\boost\non_type.hpp
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\object.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/python/object_core.hpp>
+ <boost/python/object_attributes.hpp>
+ <boost/python/object_items.hpp>
+ <boost/python/object_slices.hpp>
+ <boost/python/object_operators.hpp>
+ <boost/python/converter/arg_to_python.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\object_core.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/type.hpp>
+ <boost/python/call.hpp>
+ <boost/python/handle_fwd.hpp>
+ <boost/python/errors.hpp>
+ <boost/python/refcount.hpp>
+ <boost/python/detail/preprocessor.hpp>
+ <boost/python/tag.hpp>
+ <boost/python/def_visitor.hpp>
+ <boost/python/detail/raw_pyobject.hpp>
+ <boost/python/detail/dependent.hpp>
+ <boost/python/object/forward.hpp>
+ <boost/python/object/add_to_namespace.hpp>
+ <boost/preprocessor/iterate.hpp>
+ <boost/preprocessor/debug/line.hpp>
+ <boost/python/detail/is_xxx.hpp>
+ <boost/python/detail/string_literal.hpp>
+ <boost/python/detail/def_helper_fwd.hpp>
+ <boost/type_traits/is_same.hpp>
+ <boost/type_traits/is_convertible.hpp>
+ <boost/type_traits/remove_reference.hpp>
+ <boost/type_traits/add_pointer.hpp>
+ <boost/mpl/if.hpp>
+ <boost/python/slice_nil.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\call.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/type.hpp>
+ <boost/python/converter/arg_to_python.hpp>
+ <boost/python/converter/return_from_python.hpp>
+ <boost/python/detail/preprocessor.hpp>
+ <boost/python/detail/void_return.hpp>
+ <boost/preprocessor/comma_if.hpp>
+ <boost/preprocessor/iterate.hpp>
+ <boost/preprocessor/repeat.hpp>
+ <boost/preprocessor/debug/line.hpp>
+ <boost/preprocessor/repetition/enum_trailing_params.hpp>
+ <boost/preprocessor/repetition/enum_binary_params.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\converter\arg_to_python.hpp
+ <boost/python/ptr.hpp>
+ <boost/python/tag.hpp>
+ <boost/python/to_python_indirect.hpp>
+ <boost/python/converter/registered.hpp>
+ <boost/python/converter/registered_pointee.hpp>
+ <boost/python/converter/arg_to_python_base.hpp>
+ <boost/python/converter/shared_ptr_to_python.hpp>
+ <boost/python/converter/builtin_converters.hpp>
+ <boost/python/object/function_handle.hpp>
+ <boost/python/base_type_traits.hpp>
+ <boost/python/detail/indirect_traits.hpp>
+ <boost/python/detail/convertible.hpp>
+ <boost/python/detail/string_literal.hpp>
+ <boost/python/detail/value_is_shared_ptr.hpp>
+ <boost/type_traits/cv_traits.hpp>
+ <boost/type_traits/composite_traits.hpp>
+ <boost/type_traits/function_traits.hpp>
+ <boost/mpl/or.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\ptr.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/config.hpp>
+ <boost/mpl/bool.hpp>
+ <boost/type.hpp>
+
+1149109624 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\bool.hpp
+ <boost/mpl/bool_fwd.hpp>
+ <boost/mpl/integral_c_tag.hpp>
+ <boost/mpl/aux_/config/static_constant.hpp>
+
+1149109624 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\bool_fwd.hpp
+ <boost/mpl/aux_/adl_barrier.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\adl_barrier.hpp
+ <boost/mpl/aux_/config/adl.hpp>
+ <boost/mpl/aux_/config/gcc.hpp>
+ <boost/mpl/aux_/config/workaround.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\adl.hpp
+ <boost/mpl/aux_/config/msvc.hpp>
+ <boost/mpl/aux_/config/intel.hpp>
+ <boost/mpl/aux_/config/gcc.hpp>
+ <boost/mpl/aux_/config/workaround.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\msvc.hpp
+ <boost/config.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\intel.hpp
+ <boost/config.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\gcc.hpp
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\workaround.hpp
+ <boost/detail/workaround.hpp>
+
+1149109616 c:\sdk\cccp dll\boost-1.32.0\include\boost\detail\workaround.hpp
+
+1149109624 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\integral_c_tag.hpp
+ <boost/mpl/aux_/adl_barrier.hpp>
+ <boost/mpl/aux_/config/static_constant.hpp>
+
+1149109620 c:\sdk\cccp dll\boost-1.32.0\include\boost\mpl\aux_\config\static_constant.hpp
+ <boost/config.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\tag.hpp
+ <boost/python/detail/prefix.hpp>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\to_python_indirect.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/python/object/pointer_holder.hpp>
+ <boost/python/object/make_ptr_instance.hpp>
+ <boost/python/detail/none.hpp>
+ <boost/python/refcount.hpp>
+ <boost/type_traits/is_pointer.hpp>
+ <boost/type_traits/is_polymorphic.hpp>
+ <boost/mpl/bool.hpp>
+ <boost/shared_ptr.hpp>
+ <memory>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\object\pointer_holder.hpp
+ <boost/get_pointer.hpp>
+ <boost/type.hpp>
+ <boost/python/instance_holder.hpp>
+ <boost/python/object/inheritance_query.hpp>
+ <boost/python/object/forward.hpp>
+ <boost/python/pointee.hpp>
+ <boost/python/type_id.hpp>
+ <boost/python/detail/wrapper_base.hpp>
+ <boost/python/detail/force_instantiate.hpp>
+ <boost/python/detail/preprocessor.hpp>
+ <boost/mpl/if.hpp>
+ <boost/mpl/apply.hpp>
+ <boost/preprocessor/comma_if.hpp>
+ <boost/preprocessor/iterate.hpp>
+ <boost/preprocessor/repeat.hpp>
+ <boost/preprocessor/debug/line.hpp>
+ <boost/preprocessor/enum_params.hpp>
+ <boost/preprocessor/repetition/enum_binary_params.hpp>
+ <boost/detail/workaround.hpp>
+
+1149109616 c:\sdk\cccp dll\boost-1.32.0\include\boost\get_pointer.hpp
+ <memory>
+
+1149109634 c:\sdk\cccp dll\boost-1.32.0\include\boost\python\instance_holder.hpp
+ <boost/python/detail/prefix.hpp>
+ <boost/utility.hpp>
+ <boost/python/type_id.hpp>
+ <cstddef>
+
+1149109642 c:\sdk\cccp dll...
[truncated message content] |
