Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
RecursiveVision committed Jun 30, 2024
1 parent 17b04ce commit fc10783
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CvGameCoreDLL_Expansion2/CvCultureClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4882,6 +4882,9 @@ int CvPlayerCulture::GetTourismModifierSharedReligion(PlayerTypes eTargetPlayer)

switch (/*0 in CP, 2 in VP*/ GD_INT_GET(TOURISM_MODIFIER_SHARED_RELIGION_TYPE))
{
case 0:
// Flat value if both players have the same religion
return GET_PLAYER(eTargetPlayer).GetReligions()->GetStateReligion() == eMyReligion ? iModifier + iMultiplier : 0;
case 1:
// Scales with number of cities following religion
iModifier *= GC.getGame().GetGameReligions()->GetNumDomesticCitiesFollowing(eMyReligion, eTargetPlayer);
Expand All @@ -4892,9 +4895,6 @@ int CvPlayerCulture::GetTourismModifierSharedReligion(PlayerTypes eTargetPlayer)
int iPopulation = GET_PLAYER(eTargetPlayer).getTotalPopulation();
iModifier = iModifier * 100 * iFollowers / iPopulation;
break;
default:
// Flat value if both players have the same religion
return GET_PLAYER(eTargetPlayer).GetReligions()->GetStateReligion() == eMyReligion ? iModifier + iMultiplier : 0;
}

if (iModifierMax > 0)
Expand Down
2 changes: 1 addition & 1 deletion CvGameCoreDLL_Expansion2/Lua/CvLuaPlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4511,7 +4511,7 @@ int CvLuaPlayer::lGetEmpireSizeSupplyReduction(lua_State* L)
iTotalSupplyWithoutReduction += pkPlayer->GetNumUnitsSuppliedByPopulation();
iTotalSupplyWithoutReduction += pkPlayer->GetUnitSupplyFromExpendedGreatPeople();

int TotalSupplyWithReduction = iTotalSupplyWithoutReduction * 100 / (100 + iReductionPercent);
int iTotalSupplyWithReduction = iTotalSupplyWithoutReduction * 100 / (100 + iReductionPercent);

int iTotalSupply = (iTotalSupplyWithoutReduction - iTotalSupplyWithReduction);

Expand Down

0 comments on commit fc10783

Please sign in to comment.