From b0583285a66805c7daec67dda110747bab0ec5f6 Mon Sep 17 00:00:00 2001
From: RecursiveVision <66801010+RecursiveVision@users.noreply.github.com>
Date: Sat, 29 Jun 2024 15:00:10 -0400
Subject: [PATCH] GOTTA, SWEEP SWEEP SWEEP!

---
 CvGameCoreDLL_Expansion2/CvCityCitizens.cpp   | 2 +-
 CvGameCoreDLL_Expansion2/CvCultureClasses.cpp | 8 ++++----
 CvGameCoreDLL_Expansion2/CvGlobals.h          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp b/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp
index 0617f68038..594de29a0a 100644
--- a/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp
+++ b/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp
@@ -2099,7 +2099,7 @@ void CvCityCitizens::DoAlterWorkingPlot(int iIndex)
 
 		if (pPlot != NULL)
 		{
-			// can't work the the center tile of another city
+			// can't work the center tile of another city
 			if (pPlot->isCity())
 				return;
 
diff --git a/CvGameCoreDLL_Expansion2/CvCultureClasses.cpp b/CvGameCoreDLL_Expansion2/CvCultureClasses.cpp
index b2e0641c41..f440c057c1 100644
--- a/CvGameCoreDLL_Expansion2/CvCultureClasses.cpp
+++ b/CvGameCoreDLL_Expansion2/CvCultureClasses.cpp
@@ -4876,15 +4876,12 @@ int CvPlayerCulture::GetTourismModifierSharedReligion(PlayerTypes eTargetPlayer)
 	if (eMyReligion <= RELIGION_PANTHEON || eTargetPlayer == NO_PLAYER)
 		return 0;
 	
-	int iModifier = /*25in CP, 1 in VP*/ GD_INT_GET(TOURISM_MODIFIER_SHARED_RELIGION);
+	int iModifier = /*25 in CP, 1 in VP*/ GD_INT_GET(TOURISM_MODIFIER_SHARED_RELIGION);
 	int iModifierMax = /*0 in CP, 50 in VP*/ GD_INT_GET(TOURISM_MODIFIER_SHARED_RELIGION_MAX);
 	int iMultiplier = m_pPlayer->GetPlayerPolicies()->GetNumericModifier(POLICYMOD_SHARED_RELIGION_TOURISM_MODIFIER) + m_pPlayer->GetPlayerTraits()->GetSharedReligionTourismModifier();
 	
 	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);
@@ -4895,6 +4892,9 @@ 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)
diff --git a/CvGameCoreDLL_Expansion2/CvGlobals.h b/CvGameCoreDLL_Expansion2/CvGlobals.h
index 1e767e61ef..287f24c86d 100644
--- a/CvGameCoreDLL_Expansion2/CvGlobals.h
+++ b/CvGameCoreDLL_Expansion2/CvGlobals.h
@@ -2773,8 +2773,8 @@ class CvGlobals
 	GD_INT_MEMBER(BASE_CULTURE_PER_GREAT_WORK);
 	GD_INT_MEMBER(BASE_TOURISM_PER_GREAT_WORK);
 	GD_INT_MEMBER(TOURISM_MODIFIER_SHARED_RELIGION);
-	GD_INT_MEMBER(TOURISM_MODIFIER_SHARED_RELIGION_MAX);
-	GD_INT_MEMBER(TOURISM_MODIFIER_SHARED_RELIGION_TYPE);
+	GD_INT_MEMBER(TOURISM_MODIFIER_SHARED_RELIGION_MAX); // VP
+	GD_INT_MEMBER(TOURISM_MODIFIER_SHARED_RELIGION_TYPE); // VP
 	GD_INT_MEMBER(TOURISM_MODIFIER_TRADE_ROUTE);
 	GD_INT_MEMBER(TOURISM_MODIFIER_OPEN_BORDERS);
 	GD_INT_MEMBER(TOURISM_MODIFIER_DIFFERENT_IDEOLOGIES);