Extra fix for advanced options

LoneGazebo · Jun 25, 2024 · 8a0ff9e · 8a0ff9e
1 parent 11eb133
commit 8a0ff9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvCity.cpp b/CvGameCoreDLL_Expansion2/CvCity.cpp
@@ -34893,6 +34893,9 @@ void CvCity::SpawnFreeUnit(UnitTypes eUnit)
 	ReligionTypes eReligion = NO_RELIGION;
 	if (pkUnitInfo->IsSpreadReligion() || pkUnitInfo->IsRemoveHeresy())
 	{
+		if (GC.getGame().isOption(GAMEOPTION_NO_RELIGION))
+			return;
+
 		eReligion = kPlayer.GetReligions()->GetStateReligion(false);
 		if (eReligion == NO_RELIGION)
 			eReligion = GetCityReligions()->GetReligiousMajority();

diff --git a/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp b/CvGameCoreDLL_Expansion2/CvCityCitizens.cpp
@@ -3215,6 +3215,9 @@ void CvCityCitizens::DoSpawnGreatPerson(UnitTypes eUnit, bool bIncrementCount, b
 {
 	CvAssert(eUnit != NO_UNIT);
 
+	if (GC.getUnitInfo(eUnit)->IsFoundReligion() && GC.getGame().isOption(GAMEOPTION_NO_RELIGION))
+		return;
+
 	// Not a great person
 	if (GC.getUnitInfo(eUnit)->GetSpecialUnitType() != static_cast<SpecialUnitTypes>(GC.getInfoTypeForString("SPECIALUNIT_PEOPLE")))
 		return;