|
From: <imp...@us...> - 2007-03-12 21:31:27
|
Revision: 39
http://civ4ccp.svn.sourceforge.net/civ4ccp/?rev=39&view=rev
Author: impalerwrg
Date: 2007-03-12 14:31:25 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Incremental TR headers City, Plot
Modified Paths:
--------------
CvGameCoreDLL/CvCity.h
CvGameCoreDLL/CvGameCoreDLL.depend
CvGameCoreDLL/CvPlot.h
Modified: CvGameCoreDLL/CvCity.h
===================================================================
--- CvGameCoreDLL/CvCity.h 2007-03-12 21:22:57 UTC (rev 38)
+++ CvGameCoreDLL/CvCity.h 2007-03-12 21:31:25 UTC (rev 39)
@@ -777,7 +777,7 @@
//------------------CCCP NEW-----------------------
int getLocalGreatPeopleRate() const; // GreatPeoplePointPooling by Impaler[WrG]
-
+
int getLocalSpecialistYieldChange(SpecialistTypes eSpecialist, YieldTypes eIndex) const; // LocalSpecialistYieldChange by Impaler[WrG]
void changeLocalSpecialistYieldChange(SpecialistTypes eSpecialist, YieldTypes eYield, int iChange); // LocalSpecialistYieldChange by Impaler[WrG]
int getLocalSpecialistCommerceChange( SpecialistTypes eSpecialist, CommerceTypes eIndex) const; // LocalSpecialistCommerceChange by Impaler[WrG]
@@ -785,7 +785,7 @@
bool isFreeConnections() const; // FreeAreaConnections by Impaler[WrG]
void setFreeConnections(bool newValue); // Addition FreeAreaConnections by Impaler[WrG]
-
+
// < Building Resource Converter Start >
void processBuildingBonuses();
DllExport int getBuildingOutputBonus(BonusTypes eIndex); // Exposed to Python
@@ -1010,12 +1010,12 @@
int* m_paiBuildingOutputBonuses; // < Building Resource Converter >
int m_SpyDefenseModifier; // Additional Spy Missions by Impaler[WrG]
-
+
// Changes Start
int m_iReligionGoodHealth;
int m_iReligionBadHealth;
// Changes Start
-
+
// < Changes Start >
int* m_aiBuildingYieldChange;
int* m_aiStateReligionYieldRateModifier;
Modified: CvGameCoreDLL/CvGameCoreDLL.depend
===================================================================
--- CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:22:57 UTC (rev 38)
+++ CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:31:25 UTC (rev 39)
@@ -31051,7 +31051,7 @@
"CvArea.h"
"CvPlot.h"
-1173731815 c:\sdk\cccp dll\cvplot.h
+1173728959 c:\sdk\cccp dll\cvplot.h
"LinkedList.h"
<bitset>
@@ -31083,7 +31083,7 @@
1173731815 c:\sdk\cccp dll\cvcityai.h
"CvCity.h"
-1173731816 c:\sdk\cccp dll\cvcity.h
+1173734589 c:\sdk\cccp dll\cvcity.h
"CvDLLEntity.h"
"LinkedList.h"
@@ -31092,7 +31092,7 @@
1173731816 c:\sdk\cccp dll\cvunitai.h
"CvUnit.h"
-1173731815 c:\sdk\cccp dll\cvunit.h
+1173734678 c:\sdk\cccp dll\cvunit.h
"CvDLLEntity.h"
1173731815 c:\sdk\cccp dll\cvselectiongroupai.h
Modified: CvGameCoreDLL/CvPlot.h
===================================================================
--- CvGameCoreDLL/CvPlot.h 2007-03-12 21:22:57 UTC (rev 38)
+++ CvGameCoreDLL/CvPlot.h 2007-03-12 21:31:25 UTC (rev 39)
@@ -20,6 +20,7 @@
class CvUnit;
class CvSymbol;
class CvFlagEntity;
+class CvPlotRegion;
typedef bool (*ConstPlotUnitFunc)( const CvUnit* pUnit, int iData1, int iData2);
typedef bool (*PlotUnitFunc)(CvUnit* pUnit, int iData1, int iData2);
@@ -38,8 +39,8 @@
DllExport void erase(); // Exposed to Python
- DllExport float getPointX() const;
- DllExport float getPointY() const;
+ DllExport float getPointX() const;
+ DllExport float getPointY() const;
DllExport NiPoint3 getPoint() const; // Exposed to Python
float getSymbolSize() const;
@@ -78,7 +79,7 @@
bool isAdjacentToArea(const CvArea* pArea) const; // Exposed to Python
bool shareAdjacentArea( const CvPlot* pPlot) const; // Exposed to Python
- bool isAdjacentToLand() const; // Exposed to Python
+ bool isAdjacentToLand() const; // Exposed to Python
bool isCoastalLand(int iMinWaterSize = -1) const; // Exposed to Python
bool isVisibleWorked() const;
@@ -100,7 +101,7 @@
int getNearestLandArea() const; // Exposed to Python
CvPlot* getNearestLandPlot() const; // Exposed to Python
- int seeFromLevel(TeamTypes eTeam) const; // Exposed to Python
+ int seeFromLevel(TeamTypes eTeam) const; // Exposed to Python
int seeThroughLevel() const; // Exposed to Python
void changeSeeFromSight(TeamTypes eTeam, DirectionTypes eDirection, int iFromLevel, bool bIncrement, InvisibleTypes eSeeInvisible);
void changeAdjacentSight(TeamTypes eTeam, int iRange, bool bIncrement, InvisibleTypes eSeeInvisible);
@@ -116,11 +117,11 @@
DllExport int getFeatureProduction(BuildTypes eBuild, TeamTypes eTeam, CvCity** ppCity) const; // Exposed to Python
DllExport CvUnit* getBestDefender(PlayerTypes eOwner, PlayerTypes eAttackingPlayer = NO_PLAYER, const CvUnit* pAttacker = NULL, bool bTestAtWar = false, bool bTestPotentialEnemy = false, bool bTestCanMove = false) const; // Exposed to Python
- CvUnit* getSelectedUnit() const; // Exposed to Python
- int getUnitPower(PlayerTypes eOwner = NO_PLAYER) const; // Exposed to Python
+ CvUnit* getSelectedUnit() const; // Exposed to Python
+ int getUnitPower(PlayerTypes eOwner = NO_PLAYER) const; // Exposed to Python
- DllExport int defenseModifier(TeamTypes eDefender, bool bIgnoreBuilding, bool bHelp = false) const; // Exposed to Python
- int movementCost(const CvUnit* pUnit, const CvPlot* pFromPlot) const; // Exposed to Python
+ DllExport int defenseModifier(TeamTypes eDefender, bool bIgnoreBuilding, bool bHelp = false) const; // Exposed to Python
+ int movementCost(const CvUnit* pUnit, const CvPlot* pFromPlot) const; // Exposed to Python
bool isAdjacentOwned() const; // Exposed to Python
bool isAdjacentPlayer(PlayerTypes ePlayer, bool bLandOnly = false) const; // Exposed to Python
@@ -195,13 +196,13 @@
}
#endif
bool at(int iX, int iY) const; // Exposed to Python
- int getLatitude() const; // Exposed to Python
+ int getLatitude() const; // Exposed to Python
int getFOWIndex() const;
DllExport CvArea* area() const; // Exposed to Python
CvArea* waterArea() const; // Exposed to Python
DllExport int getArea() const; // Exposed to Python
- void setArea(int iNewValue);
+ void setArea(int iNewValue);
DllExport int getFeatureVariety() const; // Exposed to Python
@@ -230,16 +231,16 @@
bool isStartingPlot() const; // Exposed to Python
void setStartingPlot(bool bNewValue); // Exposed to Python
-
- DllExport bool isNOfRiver() const; // Exposed to Python
- DllExport void setNOfRiver(bool bNewValue, CardinalDirectionTypes eRiverDir); // Exposed to Python
-
- DllExport bool isWOfRiver() const; // Exposed to Python
- DllExport void setWOfRiver(bool bNewValue, CardinalDirectionTypes eRiverDir); // Exposed to Python
-
- DllExport CardinalDirectionTypes getRiverNSDirection() const; // Exposed to Python
- DllExport CardinalDirectionTypes getRiverWEDirection() const; // Exposed to Python
+ DllExport bool isNOfRiver() const; // Exposed to Python
+ DllExport void setNOfRiver(bool bNewValue, CardinalDirectionTypes eRiverDir); // Exposed to Python
+
+ DllExport bool isWOfRiver() const; // Exposed to Python
+ DllExport void setWOfRiver(bool bNewValue, CardinalDirectionTypes eRiverDir); // Exposed to Python
+
+ DllExport CardinalDirectionTypes getRiverNSDirection() const; // Exposed to Python
+ DllExport CardinalDirectionTypes getRiverWEDirection() const; // Exposed to Python
+
CvPlot* getInlandCorner() const; // Exposed to Python
bool hasCoastAtSECorner() const;
@@ -363,15 +364,15 @@
void setRevealed(TeamTypes eTeam, bool bNewValue, bool bTerrainOnly = false, TeamTypes eFromTeam = NO_TEAM); // Exposed to Python
DllExport ImprovementTypes getRevealedImprovementType(TeamTypes eTeam, bool bDebug) const; // Exposed to Python
- void setRevealedImprovementType(TeamTypes eTeam, ImprovementTypes eNewValue);
+ void setRevealedImprovementType(TeamTypes eTeam, ImprovementTypes eNewValue);
DllExport RouteTypes getRevealedRouteType(TeamTypes eTeam, bool bDebug) const; // Exposed to Python
- void setRevealedRouteType(TeamTypes eTeam, RouteTypes eNewValue);
+ void setRevealedRouteType(TeamTypes eTeam, RouteTypes eNewValue);
- int getBuildProgress(BuildTypes eBuild) const; // Exposed to Python
- bool changeBuildProgress(BuildTypes eBuild, int iChange, TeamTypes eTeam = NO_TEAM); // Exposed to Python
+ int getBuildProgress(BuildTypes eBuild) const; // Exposed to Python
+ bool changeBuildProgress(BuildTypes eBuild, int iChange, TeamTypes eTeam = NO_TEAM); // Exposed to Python
- void updateFeatureSymbolVisibility();
+ void updateFeatureSymbolVisibility();
void updateFeatureSymbol(bool bForce = false);
DllExport bool isLayoutDirty() const; // The plot layout contains bonuses and improvements --- it is, like the city layout, passively computed by LSystems
@@ -433,11 +434,24 @@
void read(FDataStreamBase* pStream);
void write(FDataStreamBase* pStream);
- //---------------NEW-------------------------
-
- bool isValidDomainForLocation(const CvUnit* pUnit, DomainTypes eDomain) const; // Addition RogerBacon FlyingMod // Exposed to Python
- bool isValidDomainForAction(const CvUnit* pUnit, DomainTypes eDomain) const; // Addition RogerBacon FlyingMod // Exposed to Python
-
+ //--------------------------CCCP NEW------------------------------
+
+ DllExport bool isOcean() const; // < Is Ocean by 12Monkeys >
+
+ bool isValidDomainForLocation(const CvUnit* pUnit, DomainTypes eDomain) const; // < RogerBacon FlyingMod > // Exposed to Python
+ bool isValidDomainForAction(const CvUnit* pUnit, DomainTypes eDomain) const; // < RogerBacon FlyingMod > // Exposed to Python
+
+ bool isAdjacentToArea(int iAreaID) const;
+ void clearAllVisibility();
+
+ //void addVisiblePlots(CvPlotRegion& visiblePlots, int iRange, TeamTypes eTeam) const;
+ //void addVisiblePlots(CvPlotDataRegion& visiblePlots, int iRange, int iObserverCount, TeamTypes eTeam) const;
+
+ //void buildVisibilityRegion(CvPlotRegion& visiblePlots, TeamTypes eTeam) const;
+ //void buildVisibilityRegion(CvPlotDataRegion& visiblePlots, TeamTypes eTeam) const;
+
+ int AI_sumStrength(PlayerTypes eOwner, PlayerTypes eAttackingPlayer = NO_PLAYER, DomainTypes eDomainType = NO_DOMAIN, bool bDefensiveBonuses = true, bool bTestAtWar = false, bool bTestPotentialEnemy = false) const;
+
protected:
short m_iX;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|