diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index e3f51a57cf..345521e952 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -268,6 +268,9 @@ Mods: = Base ruleset mods: = Extension mods: = +World Wrap = +World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes! = + # Multiplayer Username = diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index e843362272..e66c1243e7 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -115,6 +115,8 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed mapParameters.worldWrap = worldWrapCheckbox.isChecked } add(worldWrapCheckbox).colspan(2).row() + add("World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes!" + .toLabel(fontSize = 14).apply { wrap=true }).colspan(2).fillX().row() } private fun addAdvancedSettings() { diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 67040a6b3e..52052651b5 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -71,7 +71,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings, protected var pixelCivilianUnitGroup = ActionlessGroup().apply { isTransform = false; setSize(groupSize, groupSize) } class MiscLayerGroupClass:ActionlessGroup(){ - override fun draw(batch: Batch?, parentAlpha: Float) { super.draw(batch, parentAlpha) } + override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha) } val miscLayerGroup = MiscLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize) }