Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 15ec5ce

Browse files
Toffer90Toffer90
committed
Merge branch 'master' into release
2 parents 2215c9d + c09aaf7 commit 15ec5ce

13 files changed

Lines changed: 788 additions & 1375 deletions

‎Assets/XML/Buildings/zAnimals_CIV4BuildingInfos.xml‎

Lines changed: 233 additions & 221 deletions
Large diffs are not rendered by default.

‎Assets/XML/Text/Bonus_CIV4GameText.xml‎

Lines changed: 425 additions & 425 deletions
Large diffs are not rendered by default.

‎Sources/CvBuildingInfo.cpp‎

Lines changed: 3 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ m_piBonusHappinessChanges(NULL),
195195
m_piBonusProductionModifier(NULL),
196196
m_piUnitCombatFreeExperience(NULL),
197197
m_piDomainFreeExperience(NULL),
198-
m_bAnyUnitCombatFreeExperience(false),
199-
m_bAnyDomainFreeExperience(false),
200198
m_piDomainProductionModifier(NULL),
201199
m_piBuildingHappinessChanges(NULL),
202200
m_piPrereqNumOfBuilding(NULL),
@@ -234,11 +232,6 @@ m_ppaiBonusYieldModifier(NULL)
234232
,m_iHealthPercentPerPopulation(0)
235233
,m_iHappinessPercentPerPopulation(0)
236234
//New Booleans
237-
,m_bAnySpecialistYieldChanges(false)
238-
,m_bAnySpecialistCommerceChanges(false)
239-
,m_bAnyLocalSpecialistYieldChanges(false)
240-
,m_bAnyLocalSpecialistCommerceChanges(false)
241-
,m_bAnyBonusYieldModifiers(false)
242235
,m_bApplyFreePromotionOnMove(false)
243236
,m_bBuildOnlyOnPeaks(false)
244237
,m_bPrereqPower(false)
@@ -271,34 +264,15 @@ m_ppaiBonusYieldModifier(NULL)
271264
,m_piCommerceAttacks(NULL)
272265
//New Multidimensional Integer Arrays
273266
,m_ppaiTechCommerceChange(NULL)
274-
,m_bAnyTechCommerceChanges(false)
275-
276267
,m_ppaiTechYieldChange(NULL)
277-
,m_bAnyTechYieldChanges(false)
278-
279268
,m_ppaiTechSpecialistChange(NULL)
280-
,m_bAnyTechSpecialistChanges(false)
281-
282269
,m_ppaiTechCommerceModifier(NULL)
283-
,m_bAnyTechCommerceModifiers(false)
284-
285270
,m_ppaiTechYieldModifier(NULL)
286-
,m_bAnyTechYieldModifiers(false)
287-
288271
,m_ppaiBonusCommerceModifier(NULL)
289-
,m_bAnyBonusCommerceModifiers(false)
290-
291272
,m_ppaiBonusYieldChanges(NULL)
292-
,m_bAnyBonusYieldChanges(false)
293-
294273
,m_ppaiVicinityBonusYieldChanges(NULL)
295-
,m_bAnyVicinityBonusYieldChanges(false)
296-
297274
,m_ppaiBonusCommercePercentChanges(NULL)
298-
,m_bAnyBonusCommercePercentChanges(false)
299-
300275
,m_ppiImprovementYieldChanges(NULL)
301-
302276
,m_PropertyManipulators()
303277
,m_pExprNewCityFree(NULL)
304278
,m_pExprConstructCondition(NULL)
@@ -792,16 +766,6 @@ int CvBuildingInfo::getDomainFreeExperience(int i) const
792766
}
793767
}
794768

795-
bool CvBuildingInfo::isAnyUnitCombatFreeExperience() const
796-
{
797-
return m_bAnyUnitCombatFreeExperience;
798-
}
799-
800-
bool CvBuildingInfo::isAnyDomainFreeExperience() const
801-
{
802-
return m_bAnyDomainFreeExperience;
803-
}
804-
805769
int CvBuildingInfo::getDomainProductionModifier(int i) const
806770
{
807771
FASSERT_BOUNDS(NO_DOMAIN, NUM_DOMAIN_TYPES, i)
@@ -1805,7 +1769,7 @@ int CvBuildingInfo::getTechOutbreakLevelChange(int iTech) const
18051769

18061770
return 0;
18071771
}
1808-
//Team Project (1)
1772+
18091773
int CvBuildingInfo::getNumTechHappinessTypes() const
18101774
{
18111775
return m_aTechHappinessTypes.size();
@@ -1840,17 +1804,6 @@ int CvBuildingInfo::getTechHealthType(int iTech) const
18401804
return 0;
18411805
}
18421806

1843-
//Arrays
1844-
bool CvBuildingInfo::isAnySpecialistCommerceChanges() const
1845-
{
1846-
return m_bAnySpecialistCommerceChanges;
1847-
}
1848-
1849-
bool CvBuildingInfo::isAnyLocalSpecialistCommerceChanges() const
1850-
{
1851-
return m_bAnyLocalSpecialistCommerceChanges;
1852-
}
1853-
18541807
bool CvBuildingInfo::isHurry(int i) const
18551808
{
18561809
FASSERT_BOUNDS(0, GC.getNumHurryInfos(), i)
@@ -2199,8 +2152,6 @@ void CvBuildingInfo::getCheckSum(unsigned int& iSum) const
21992152
CheckSumI(iSum, GC.getNumBonusInfos(), m_piBonusProductionModifier);
22002153
CheckSumI(iSum, GC.getNumUnitCombatInfos(), m_piUnitCombatFreeExperience);
22012154
CheckSumI(iSum, NUM_DOMAIN_TYPES, m_piDomainFreeExperience);
2202-
CheckSum(iSum, m_bAnyUnitCombatFreeExperience);
2203-
CheckSum(iSum, m_bAnyDomainFreeExperience);
22042155
CheckSumI(iSum, NUM_DOMAIN_TYPES, m_piDomainProductionModifier);
22052156
CheckSumI(iSum, GC.getNumBuildingInfos(), m_piBuildingHappinessChanges);
22062157
CheckSumI(iSum, GC.getNumBuildingInfos(), m_piPrereqNumOfBuilding);
@@ -2963,19 +2914,8 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
29632914
pXML->SetVariableListTagPair(&m_piBonusHealthChanges, L"BonusHealthChanges", GC.getNumBonusInfos());
29642915
pXML->SetVariableListTagPair(&m_piBonusHappinessChanges, L"BonusHappinessChanges", GC.getNumBonusInfos());
29652916
pXML->SetVariableListTagPair(&m_piBonusProductionModifier, L"BonusProductionModifiers", GC.getNumBonusInfos());
2966-
29672917
pXML->SetVariableListTagPair(&m_piUnitCombatFreeExperience, L"UnitCombatFreeExperiences", GC.getNumUnitCombatInfos());
2968-
if (m_piUnitCombatFreeExperience)
2969-
{
2970-
m_bAnyUnitCombatFreeExperience = true;
2971-
}
2972-
29732918
pXML->SetVariableListTagPair(&m_piDomainFreeExperience, L"DomainFreeExperiences", NUM_DOMAIN_TYPES);
2974-
if (m_piDomainFreeExperience)
2975-
{
2976-
m_bAnyDomainFreeExperience = true;
2977-
}
2978-
29792919
pXML->SetVariableListTagPair(&m_piDomainProductionModifier, L"DomainProductionModifiers", NUM_DOMAIN_TYPES);
29802920

29812921
if (pXML->TryMoveToXmlFirstChild(L"SpecialistYieldChanges"))
@@ -3004,7 +2944,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
30042944
// call the function that sets the yield change variable
30052945
pXML->SetYields(&m_ppaiSpecialistYieldChange[k]);
30062946
pXML->MoveToXmlParent();
3007-
m_bAnySpecialistYieldChanges = true;
30082947
}
30092948
}
30102949

@@ -3048,7 +2987,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
30482987
// call the function that sets the yield change variable
30492988
pXML->SetCommerce(&m_ppaiSpecialistCommerceChange[k]);
30502989
pXML->MoveToXmlParent();
3051-
m_bAnySpecialistCommerceChanges = true;
30522990
}
30532991
}
30542992

@@ -3093,7 +3031,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
30933031
// call the function that sets the yield change variable
30943032
pXML->SetYields(&m_ppaiLocalSpecialistYieldChange[k]);
30953033
pXML->MoveToXmlParent();
3096-
m_bAnyLocalSpecialistYieldChanges = true;
30973034
}
30983035
}
30993036

@@ -3137,7 +3074,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
31373074
// call the function that sets the yield change variable
31383075
pXML->SetCommerce(&m_ppaiLocalSpecialistCommerceChange[k]);
31393076
pXML->MoveToXmlParent();
3140-
m_bAnyLocalSpecialistCommerceChanges = true;
31413077
}
31423078
}
31433079

@@ -3181,7 +3117,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
31813117
// call the function that sets the yield change variable
31823118
pXML->SetYields(&m_ppaiBonusYieldModifier[k]);
31833119
pXML->MoveToXmlParent();
3184-
m_bAnyBonusYieldModifiers = true;
31853120
}
31863121
}
31873122

@@ -3287,7 +3222,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
32873222
// call the function that sets the commerce change variable
32883223
pXML->SetCommerce(&m_ppaiBonusCommerceModifier[k]);
32893224
pXML->MoveToXmlParent();
3290-
m_bAnyBonusCommerceModifiers = true;
32913225
}
32923226
}
32933227

@@ -3331,7 +3265,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
33313265
// call the function that sets the commerce change variable
33323266
pXML->SetCommerce(&m_ppaiBonusCommercePercentChanges[k]);
33333267
pXML->MoveToXmlParent();
3334-
m_bAnyBonusCommercePercentChanges = true;
33353268
}
33363269
}
33373270

@@ -3375,7 +3308,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
33753308
// call the function that sets the commerce change variable
33763309
pXML->SetYields(&m_ppaiBonusYieldChanges[k]);
33773310
pXML->MoveToXmlParent();
3378-
m_bAnyBonusYieldChanges = true;
33793311
}
33803312
}
33813313

@@ -3419,7 +3351,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
34193351
// call the function that sets the commerce change variable
34203352
pXML->SetYields(&m_ppaiVicinityBonusYieldChanges[k]);
34213353
pXML->MoveToXmlParent();
3422-
m_bAnyVicinityBonusYieldChanges = true;
34233354
}
34243355
}
34253356

@@ -3592,7 +3523,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
35923523
// call the function that sets the commerce change variable
35933524
pXML->SetCommerce(&m_ppaiTechCommerceChange[k]);
35943525
pXML->MoveToXmlParent();
3595-
m_bAnyTechCommerceChanges = true;
35963526
}
35973527
}
35983528

@@ -3638,7 +3568,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
36383568
// call the function that sets the yield change variable
36393569
pXML->SetYields(&m_ppaiTechYieldChange[k]);
36403570
pXML->MoveToXmlParent();
3641-
m_bAnyTechYieldChanges = true;
36423571
}
36433572
}
36443573

@@ -3679,7 +3608,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
36793608
}
36803609
}
36813610
pXML->SetVariableListTagPair(&m_ppaiTechSpecialistChange[k], L"SpecialistCounts", GC.getNumSpecialistInfos());
3682-
m_bAnyTechSpecialistChanges = true;
36833611
}
36843612

36853613
if (!pXML->TryMoveToXmlNextSibling())
@@ -3723,7 +3651,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
37233651
// call the function that sets the commerce change variable
37243652
pXML->SetCommerce(&m_ppaiTechCommerceModifier[k]);
37253653
pXML->MoveToXmlParent();
3726-
m_bAnyTechCommerceModifiers = true;
37273654
}
37283655
}
37293656

@@ -3769,7 +3696,6 @@ bool CvBuildingInfo::read(CvXMLLoadUtility* pXML)
37693696
// call the function that sets the yield change variable
37703697
pXML->SetYields(&m_ppaiTechYieldModifier[k]);
37713698
pXML->MoveToXmlParent();
3772-
m_bAnyTechYieldChanges = true;
37733699
}
37743700
}
37753701
if (!pXML->TryMoveToXmlNextSibling())
@@ -4631,12 +4557,7 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
46314557
CvXMLLoadUtility::InitList(&m_piUnitCombatFreeExperience,GC.getNumUnitCombatInfos(),iDefault);
46324558
}
46334559
m_piUnitCombatFreeExperience[j] = pClassInfo->getUnitCombatFreeExperience(j);
4634-
m_bAnyUnitCombatFreeExperience = true;
46354560
}
4636-
//if ( getUnitCombatFreeExperience(j) != iDefault || pClassInfo->getUnitCombatFreeExperience(j) != iDefault)
4637-
//{
4638-
// m_bAnyUnitCombatFreeExperience = true;
4639-
//}
46404561
}
46414562
for ( int j = 0; j < NUM_DOMAIN_TYPES; j++)
46424563
{
@@ -4647,12 +4568,7 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
46474568
CvXMLLoadUtility::InitList(&m_piDomainFreeExperience,NUM_DOMAIN_TYPES,iDefault);
46484569
}
46494570
m_piDomainFreeExperience[j] = pClassInfo->getDomainFreeExperience(j);
4650-
m_bAnyDomainFreeExperience = true;
46514571
}
4652-
//if ( getDomainFreeExperience(j) != iDefault || pClassInfo->getDomainFreeExperience(j) != iDefault)
4653-
//{
4654-
// m_bAnyDomainFreeExperience = true;
4655-
//}
46564572
if ( getDomainProductionModifier(j) == iDefault && pClassInfo->getDomainProductionModifier(j) != iDefault)
46574573
{
46584574
if ( NULL == m_piDomainProductionModifier )
@@ -4683,10 +4599,9 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
46834599
}
46844600

46854601
m_ppaiSpecialistYieldChange[i][j] = iChange;
4686-
m_bAnySpecialistYieldChanges = true;
46874602
}
46884603
}
4689-
//Team Project (1)
4604+
46904605
if ( getLocalSpecialistYieldChange(i,j) == iDefault )
46914606
{
46924607
const int iChange = pClassInfo->getLocalSpecialistYieldChange(i, j);
@@ -4703,7 +4618,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
47034618
}
47044619

47054620
m_ppaiLocalSpecialistYieldChange[i][j] = iChange;
4706-
m_bAnyLocalSpecialistYieldChanges = true;
47074621
}
47084622
}
47094623
}
@@ -4725,10 +4639,9 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
47254639
}
47264640

47274641
m_ppaiSpecialistCommerceChange[i][j] = iChange;
4728-
m_bAnySpecialistCommerceChanges = true;
47294642
}
47304643
}
4731-
//Team Project (1)
4644+
47324645
if ( getLocalSpecialistCommerceChange(i,j) == iDefault )
47334646
{
47344647
const int iChange = pClassInfo->getLocalSpecialistCommerceChange(i, j);
@@ -4745,7 +4658,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
47454658
}
47464659

47474660
m_ppaiLocalSpecialistCommerceChange[i][j] = iChange;
4748-
m_bAnyLocalSpecialistCommerceChanges = true;
47494661
}
47504662
}
47514663
}
@@ -4770,7 +4682,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
47704682
}
47714683

47724684
m_ppaiBonusYieldModifier[i][j] = iChange;
4773-
m_bAnyBonusYieldModifiers = true;
47744685
}
47754686
}
47764687
}
@@ -4816,7 +4727,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
48164727
if (getFreePromotion_3() == iTextDefault) m_iFreePromotion_3 = pClassInfo->getFreePromotion_3();
48174728
if (getLineOfSight() == iDefault) m_iLineOfSight = pClassInfo->getLineOfSight();
48184729
if (getInflationModifier() == iDefault) m_iInflationModifier = pClassInfo->getInflationModifier();
4819-
if (!m_bAnyTechCommerceChanges) m_bAnyTechCommerceChanges = pClassInfo->m_bAnyTechCommerceChanges;
48204730
if (getInvasionChance() == iDefault) m_iInvasionChance = pClassInfo->getInvasionChance();
48214731
if (getAdjacentDamagePercent() == iDefault) m_iAdjacentDamagePercent = pClassInfo->getAdjacentDamagePercent();
48224732
if (getPrereqPopulation() == iDefault) m_iPrereqPopulation = pClassInfo->getPrereqPopulation();
@@ -4945,7 +4855,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
49454855
}
49464856

49474857
m_ppaiBonusCommerceModifier[i][j] = iChange;
4948-
m_bAnyBonusCommerceModifiers = true;
49494858
}
49504859
}
49514860
}
@@ -4979,7 +4888,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
49794888
}
49804889

49814890
m_ppaiBonusYieldChanges[i][j] = iChange;
4982-
m_bAnyBonusYieldChanges = true;
49834891
}
49844892
}
49854893
}
@@ -5013,7 +4921,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
50134921
}
50144922

50154923
m_ppaiBonusCommercePercentChanges[i][j] = iChange;
5016-
m_bAnyBonusCommercePercentChanges = true;
50174924
}
50184925
}
50194926
}
@@ -5047,7 +4954,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
50474954
}
50484955

50494956
m_ppaiVicinityBonusYieldChanges[i][j] = iChange;
5050-
m_bAnyVicinityBonusYieldChanges = true;
50514957
}
50524958
}
50534959
}
@@ -5152,7 +5058,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
51525058
}
51535059

51545060
m_ppaiTechCommerceChange[i][j] = iChange;
5155-
m_bAnyTechCommerceChanges = true;
51565061
}
51575062
}
51585063
}
@@ -5186,7 +5091,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
51865091
}
51875092

51885093
m_ppaiTechYieldChange[i][j] = iChange;
5189-
m_bAnyTechYieldChanges = true;
51905094
}
51915095
}
51925096
}
@@ -5220,7 +5124,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
52205124
}
52215125

52225126
m_ppaiTechSpecialistChange[i][j] = iChange;
5223-
m_bAnyTechSpecialistChanges = true;
52245127
}
52255128
}
52265129
}
@@ -5254,7 +5157,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
52545157
}
52555158

52565159
m_ppaiTechCommerceModifier[i][j] = iChange;
5257-
m_bAnyTechCommerceModifiers = true;
52585160
}
52595161
}
52605162
}
@@ -5288,7 +5190,6 @@ void CvBuildingInfo::copyNonDefaults(CvBuildingInfo* pClassInfo, CvXMLLoadUtilit
52885190
}
52895191

52905192
m_ppaiTechYieldModifier[i][j] = iChange;
5291-
m_bAnyTechYieldModifiers = true;
52925193
}
52935194
}
52945195
}

0 commit comments

Comments
 (0)