diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 2f442a9e49..9037b0a1be 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -20,8 +20,8 @@ import com.unciv.logic.civilization.PlayerType import com.unciv.logic.civilization.managers.TechManager import com.unciv.logic.civilization.managers.TurnManager import com.unciv.logic.map.CityDistanceData -import com.unciv.logic.map.tile.TileInfo import com.unciv.logic.map.TileMap +import com.unciv.logic.map.tile.TileInfo import com.unciv.models.Religion import com.unciv.models.metadata.GameParameters import com.unciv.models.ruleset.ModOptionsConstants @@ -220,7 +220,7 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion fun isReligionEnabled(): Boolean { val religionDisabledByRuleset = (ruleSet.eras[gameParameters.startingEra]!!.hasUnique(UniqueType.DisablesReligion) || ruleSet.modOptions.uniques.contains(ModOptionsConstants.disableReligion)) - return !religionDisabledByRuleset && gameParameters.religionEnabled + return !religionDisabledByRuleset } fun isEspionageEnabled(): Boolean { diff --git a/core/src/com/unciv/models/metadata/GameParameters.kt b/core/src/com/unciv/models/metadata/GameParameters.kt index 9b5dac7d4f..45fab9dc0d 100644 --- a/core/src/com/unciv/models/metadata/GameParameters.kt +++ b/core/src/com/unciv/models/metadata/GameParameters.kt @@ -33,8 +33,6 @@ class GameParameters : IsPartOfGameInfoSerialization { // Default values are the var oneCityChallenge = false var godMode = false var nuclearWeaponsEnabled = true - @Deprecated("As of 4.2.3") - var religionEnabled = true var espionageEnabled = false var noStartBias = false @@ -64,7 +62,6 @@ class GameParameters : IsPartOfGameInfoSerialization { // Default values are the parameters.ragingBarbarians = ragingBarbarians parameters.oneCityChallenge = oneCityChallenge parameters.nuclearWeaponsEnabled = nuclearWeaponsEnabled - parameters.religionEnabled = religionEnabled parameters.victoryTypes = ArrayList(victoryTypes) parameters.startingEra = startingEra parameters.isOnlineMultiplayer = isOnlineMultiplayer