Menu
▾
▴
[Civ4ccp-svn] SF.net SVN: civ4ccp: [38] CvGameCoreDLL
|
From: <imp...@us...> - 2007-03-12 21:23:00
|
Revision: 38
http://civ4ccp.svn.sourceforge.net/civ4ccp/?rev=38&view=rev
Author: impalerwrg
Date: 2007-03-12 14:22:57 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Incremental TR header, GameText, Player, Structs, Team
Modified Paths:
--------------
CvGameCoreDLL/CvGameCoreDLL.depend
CvGameCoreDLL/CvGameTextMgr.h
CvGameCoreDLL/CvPlayer.h
CvGameCoreDLL/CvStructs.h
CvGameCoreDLL/CvTeam.h
Modified: CvGameCoreDLL/CvGameCoreDLL.depend
===================================================================
--- CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:10:13 UTC (rev 37)
+++ CvGameCoreDLL/CvGameCoreDLL.depend 2007-03-12 21:22:57 UTC (rev 38)
@@ -31032,12 +31032,12 @@
1173731815 c:\sdk\cccp dll\cvstring.h
<string>
-1173720541 c:\sdk\cccp dll\cvenums.h
+1173733826 c:\sdk\cccp dll\cvenums.h
"CvDefines.h"
1173731815 c:\sdk\cccp dll\cvdefines.h
-1173731815 c:\sdk\cccp dll\cvstructs.h
+1173640684 c:\sdk\cccp dll\cvstructs.h
"CvString.h"
1173731815 c:\sdk\cccp dll\cvdllutilityifacebase.h
@@ -31072,7 +31072,7 @@
1173731815 c:\sdk\cccp dll\cvplayerai.h
"CvPlayer.h"
-1173731815 c:\sdk\cccp dll\cvplayer.h
+1173696362 c:\sdk\cccp dll\cvplayer.h
"CvCityAI.h"
"CvUnitAI.h"
"CvSelectionGroupAI.h"
@@ -31109,7 +31109,7 @@
1173731815 c:\sdk\cccp dll\cvteamai.h
"CvTeam.h"
-1173731815 c:\sdk\cccp dll\cvteam.h
+1173640913 c:\sdk\cccp dll\cvteam.h
1173731815 c:\sdk\cccp dll\cvgamecoreutils.h
"CvGlobals.h"
@@ -31232,7 +31232,7 @@
1173731815 c:\sdk\cccp dll\cvinitcore.h
-1173731815 c:\sdk\cccp dll\cvgametextmgr.h
+1173646210 c:\sdk\cccp dll\cvgametextmgr.h
"CvInfos.h"
1173731816 c:\sdk\cccp dll\cvdllentity.cpp
@@ -32232,7 +32232,7 @@
1173731815 c:\sdk\cccp dll\_precompile.cpp
"CvGameCoreDLL.h"
-1173733467 c:\sdk\cccp dll\cvgame.cpp
+1173733724 c:\sdk\cccp dll\cvgame.cpp
"CvGameCoreDLL.h"
"CvGameCoreUtils.h"
"CvGameCoreUtils.h"
Modified: CvGameCoreDLL/CvGameTextMgr.h
===================================================================
--- CvGameCoreDLL/CvGameTextMgr.h 2007-03-12 21:10:13 UTC (rev 37)
+++ CvGameCoreDLL/CvGameTextMgr.h 2007-03-12 21:22:57 UTC (rev 38)
@@ -156,9 +156,12 @@
DllExport void buildFinanceCivicUpkeepString(CvWString& szDetails, PlayerTypes ePlayer);
DllExport void buildFinanceForeignIncomeString(CvWString& szDetails, PlayerTypes ePlayer);
- //-------------------------NEW--------------------------
+ //-------------------------CCCP NEW--------------------------
DllExport void parseLeaderTraits(CvWString &szInfoText, PlayerTypes ePlayer); // < Scriptable Leader Traits >
+ void getWarplanString(CvWString& szString, WarPlanTypes eWarPlan);
+ void getDealString(CvWString& szBuffer, PlayerTypes ePlayer1, PlayerTypes ePlayer2, const CLinkList<TradeData>* pListPlayer1, const CLinkList<TradeData>* pListPlayer2, PlayerTypes ePlayerPerspective = NO_PLAYER);
+ void setCityWorkMatrixString(CvWString &szString, CvCity* pCity);
private:
@@ -173,6 +176,11 @@
int m_iNumDiplomacyTextInfos;
CvDiplomacyTextInfo* m_paDiplomacyTextInfo;
std::vector<int*> m_apbPromotion;
+
+ //-------------------------CCCP NEW--------------------------
+
+ void setCityPlotYieldValueString(CvWString &szString, CvCity* pCity, int iIndex, bool bAvoidGrowth, bool bIgnoreGrowth, bool bIgnoreFood = false);
+ void setYieldValueString(CvWString &szString, int iValue, bool bActive = false, bool bHighlight = false, bool bMakeWhitespace = false);
};
// Singleton Accessor
Modified: CvGameCoreDLL/CvPlayer.h
===================================================================
--- CvGameCoreDLL/CvPlayer.h 2007-03-12 21:10:13 UTC (rev 37)
+++ CvGameCoreDLL/CvPlayer.h 2007-03-12 21:22:57 UTC (rev 38)
@@ -24,10 +24,6 @@
CvPlayer();
virtual ~CvPlayer();
- // ---------------- REVOLUTION_MOD start ---------------------
- void resetRelations( PlayerTypes ePlayer );
- void reinit( PlayerTypes eID, LeaderHeadTypes prevLeader, bool doReset );
- // ---------------- REVOLUTION_MOD end -----------------------
DllExport void init(PlayerTypes eID);
DllExport void setupGraphical();
DllExport void reset(PlayerTypes eID = NO_PLAYER, bool bConstructorCall = false);
@@ -45,6 +41,8 @@
int startingPlotRange(); // Exposed to Python
bool startingPlotWithinRange(CvPlot* pPlot, PlayerTypes ePlayer, int iRange, int iPass); // Exposed to Python
+ int startingPlotDistanceFactor(CvPlot* pPlot, PlayerTypes ePlayer, int iRange);
+
int findStartingArea();
CvPlot* findStartingPlot();
@@ -860,12 +858,12 @@
//-------------------------CCCP NEW------------------------
- int getVoteModifier() const; // Addition TraitVotes By Impaler[WrG]
- void changeVoteModifier(int iChange); // Addition TraitVotes By Impaler[WrG]
- int getDiplomacyModifier() const; // Addition TraitDiplomacy By Impaler[WrG]
- void changeDiplomacyModifier(int iChange); // Addition TraitDiplomacy By Impaler[WrG]
- bool getBuildOutsideBordser() const; // Addition BuildOutsideBordersTrait by Impaler[WrG]
- void toggleBuildOutsideBorders(); // Addition BuildOutsideBordersTrait by Impaler[WrG]
+ int getVoteModifier() const; // Addition Trait Votes By Impaler[WrG]
+ void changeVoteModifier(int iChange); // Addition Trait Votes By Impaler[WrG]
+ int getDiplomacyModifier() const; // Addition Trait Diplomacy By Impaler[WrG]
+ void changeDiplomacyModifier(int iChange); // Addition Trait Diplomacy By Impaler[WrG]
+ bool getBuildOutsideBordser() const; // Addition Build Outside Borders Trait by Impaler[WrG]
+ void toggleBuildOutsideBorders(); // Addition Build Outside Borders Trait by Impaler[WrG]
//int getUnitTypeLimitBonus(int /*UnitTypes*/ iUnit) const;
//void changeUnitTypeLimitBonus(int /*UnitTypes*/ iUnit, int iChange);
@@ -882,11 +880,10 @@
void changeGreatPeopleUnitProgress(int /*UnitTypes*/ iIndex, int iChange);
//End Addition by Impaler[WrG]
- //Start Addition SpecialistTechCommerceChange by Impaler[WrG]
- int getSpecialistTypeExtraCommerce(SpecialistTypes i, CommerceTypes j);
- void changeSpecialistTypeExtraCommerce(SpecialistTypes i, CommerceTypes j, int iChange);
- //End Addition by Impaler[WrG]
+ int getSpecialistTypeExtraCommerce(SpecialistTypes i, CommerceTypes j); // < Specialist Tech Commerce Change by Impaler[WrG] >
+ void changeSpecialistTypeExtraCommerce(SpecialistTypes i, CommerceTypes j, int iChange); // < Specialist Tech Commerce Change by Impaler[WrG] >
+
int getUpgradeCostModifier(); // Addition UpgradeCostModifier by Impaler[WrG] 7/11/07
void changeUpgradeCostModifier(int iChange); // Addition UpgradeCostModifier by Impaler[WrG] 7/11/07
int getDiplomacyModifier(); // Addition BuildingDiplomacyModifier by Impaler[WrG] 7/11/07
@@ -895,13 +892,13 @@
bool canBuildOutsideBorders(); // Addition PlayerBuildOutsideBorders by Impaler[WrG] 7/14/06
void setcanBuildOutsideBorders(bool value); // Addition PlayerBuildOutsideBorders by Impaler[WrG] 7/14/06
+ void setDisableHuman(bool newVal); // < AI Auto Play by jdog5000 >
+ bool getDisableHuman(); // < AI Auto Play by jdog5000 >
- // Start Addition AI_AUTO_PLAY_MOD by jdog5000
- void setDisableHuman(bool newVal);
- bool getDisableHuman();
- // End Addition by jdog5000
+ void resetRelations( PlayerTypes ePlayer ); // < Revolution Mod by jdog5000 >
+ void reinit( PlayerTypes eID, LeaderHeadTypes prevLeader, bool doReset ); // < Revolution Mod by jdog5000 >
- void ProcessTrait(TraitTypes eTrait, int iChange); // < Scriptable Leader Traits >
+ void ProcessTrait(TraitTypes eTrait, int iChange); // < Scriptable Leader Traits >
// Start Addition Religion Mod by Aussie_Lurker
int getStateReligionYieldRateModifier(YieldTypes eIndex) const;
@@ -931,6 +928,7 @@
void updateBuildingYield();
void updateReligionYield();
// < Changes End >
+
// < Changes Start >
int getBuildingYieldChange(BuildingTypes eIndex1, YieldTypes eIndex2);
void changeBuildingYieldChange(BuildingTypes eIndex1, YieldTypes eIndex2, int iChange);
@@ -955,6 +953,19 @@
DllExport int getBuildingProductionModifier() const; // Wonder Building Production Modifier by Impaler[WrG]
void changeBuildingProductionModifier(int iChange); // Wonder Building Production Modifier by Impaler[WrG]
+ // < Pandemics by Mexico Start >
+ DllExport void changeGlobalPandemicModifier(int iChange);
+ DllExport void setGlobalPandemicModifier(int iNewValue);
+ DllExport int getGlobalPandemicModifier() const;
+ // < Pandemics End >
+
+ bool canPopRush();
+ int getResearchTurnsLeftTimes100(TechTypes eTech, bool bOverflow);
+
+ int countRemoveNonStateReligionUnits(CvArea* pArea, ReligionTypes eReligion); // < Inquisition by Lopez >
+
+ bool hasShrine(ReligionTypes eReligion); // < Shrine Functions by ??? >
+
protected:
int m_iStartingX;
@@ -1162,13 +1173,10 @@
int** m_ppaiSpecialBuildingCommerceChangeArray; // Addition SpecialBuildingCommerceChange by Impaler[WrG]
bool m_bcanBuildOutsideBorders; // Addition PlayerBuildOutsideBorders by Impaler[WrG]
+ bool m_bDisableHuman; // < AI AutoPlay by jdog5000 >
- // ------------- AI_AUTO_PLAY_MOD by jdog5009 start -------------
- bool m_bDisableHuman; // Set to true to disable isHuman() check
- // ---------------- AI_AUTO_PLAY_MOD end ------------------------------------
+ bool* m_pbTraits; // < Scriptable Leader Traits by Lopez & Impaler[WrG] >
- bool* m_pbTraits; // < Scriptable Leader Traits >
-
int* m_piStateReligionYieldRateModifier;
int* m_piStateReligionCommerceRateModifier;
int** m_ppaaiBuildingTypeYieldChanges;
@@ -1177,24 +1185,27 @@
int m_iSpySuccessModifier; // Additional Spy Missions by Impaler[WrG]
int m_iSpyMissionCostModifier; // Additional Spy Missions by Impaler[WrG]
- // Changes Start
+
+ // < Civics Balancer by Aussie Lurker Start >
int m_iStateReligionExtraHealth;
int m_iNonStateReligionExtraHealth;
- // Changes End
- // < Changes Start >
int** m_ppaaiBuildingYieldChange;
int** m_ppaaiBuildingCommerceChange;
- // < Changes End >
-
- // < Changes Start >
int* m_aiStateReligionCommerceRateModifier;
int* m_aiNonStateReligionCommerceRateModifier;
int* m_aiStateReligionYieldRateModifier;
int* m_aiNonStateReligionYieldRateModifier;
int* m_aiSpecialistExtraYield;
- // < Changes End >
+ // < Civics Balancer End >
int m_iBuildingProductionModifier; // Wonder Building Production Modifier by Impaler[WrG]
+
+ bool m_bNoInitial;
+ int m_iPaganObsolete;
+ int m_iGlobalPandemicModifier;
+ int m_iPlaceholderCount;
+ int* m_aiPlaceholderArray;
+ int m_iPopRushHurryCount;
};
#endif
Modified: CvGameCoreDLL/CvStructs.h
===================================================================
--- CvGameCoreDLL/CvStructs.h 2007-03-12 21:10:13 UTC (rev 37)
+++ CvGameCoreDLL/CvStructs.h 2007-03-12 21:22:57 UTC (rev 38)
@@ -13,6 +13,13 @@
XYCoords(int x=0, int y=0) : iX(x), iY(y) {}
int iX;
int iY;
+
+ bool operator< (const XYCoords xy) const { return ((iY < xy.iY) || (iY == xy.iY && iX < xy.iX)); }
+ bool operator<= (const XYCoords xy) const { return ((iY < xy.iY) || (iY == xy.iY && iX <= xy.iX)); }
+ bool operator!= (const XYCoords xy) const { return (iY != xy.iY || iX != xy.iX); }
+ bool operator== (const XYCoords xy) const { return (!(iY != xy.iY || iX != xy.iX)); }
+ bool operator>= (const XYCoords xy) const { return ((iY > xy.iY) || (iY == xy.iY && iX >= xy.iX)); }
+ bool operator> (const XYCoords xy) const { return ((iY > xy.iY) || (iY == xy.iY && iX > xy.iX)); }
};
struct DllExport IDInfo
Modified: CvGameCoreDLL/CvTeam.h
===================================================================
--- CvGameCoreDLL/CvTeam.h 2007-03-12 21:10:13 UTC (rev 37)
+++ CvGameCoreDLL/CvTeam.h 2007-03-12 21:22:57 UTC (rev 38)
@@ -298,22 +298,22 @@
//-----------------------------CCCP NEW----------------------------------
- // ---------------- REVOLUTION_MOD start ---------------------
- void resetRelations( TeamTypes eTeam );
- // ---------------- REVOLUTION_MOD end -----------------------
+ void resetRelations(TeamTypes eTeam); // < Revolution Mod by jdog5000 >
- int getRandomStealableTech(TeamTypes eTeam); // Additonal Spy Missions by Impaler[WrG]
- int getPercentResearchProgress(TechTypes eTech) const; // Additonal Spy Missions by Impaler[WrG]
+ int getRandomStealableTech(TeamTypes eTeam); // < Spy Missions by Impaler[WrG] >
+ int getPercentResearchProgress(TechTypes eTech) const; // < Spy Missions by Impaler[WrG] >
- // Start Tech Bonus Mod by Aussie Lurker
+ // < Tech Bonus Mod by Aussie Lurker Start >
int getYieldRateModifier(YieldTypes eIndex); // Exposed to Python
void changeYieldRateModifier(YieldTypes eIndex, int iChange);
int getCommerceRateModifier(CommerceTypes eIndex); // Exposed to Python
void changeCommerceRateModifier(CommerceTypes eIndex, int iChange);
- // End Tech Bonus Mod by Aussie Lurker
+ // < Tech Bonus Mod End >
- int getTotalVictoryScore(); // Mastery Victory by Sevo
+ int getTotalVictoryScore(); // Mastery Victory by Sevo
+ bool hasShrine(ReligionTypes eReligion); // < Has Shrine by ??? >
+
protected:
int m_iNumMembers;
@@ -389,9 +389,12 @@
virtual void write(FDataStreamBase* pStream);
//------------------------CCCP NEW--------------------------------
-
+
int* m_aiYieldRateModifier; // Tech Bonus Mod by Aussie Lurker
int* m_aiCommerceRateModifier; // Tech Bonus Mod by Aussie Lurker
+
+ int m_iPlaceholderCount;
+ int* m_aiPlaceholderArray;
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
