mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 01:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3691 - 'new map' from map editor copies existing map parameters

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-13 22:39:57 +02:00
parent a37ac74fa9
commit aab037b409
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt
View File

@ -14,7 +14,7 @@ import com.unciv.ui.utils.*
class MapEditorMenuPopup(var mapEditorScreen: MapEditorScreen): Popup(mapEditorScreen) {
init {
addButton("New map") { UncivGame.Current.setScreen(NewMapScreen()) }
addButton("New map") { UncivGame.Current.setScreen(NewMapScreen(mapEditorScreen.tileMap.mapParameters)) }
addButton("Save map") { mapEditorScreen.game.setScreen(SaveAndLoadMapScreen(mapEditorScreen.tileMap, true)) }
addButton("Load map") { mapEditorScreen.game.setScreen(SaveAndLoadMapScreen(mapEditorScreen.tileMap)) }
addButton("Exit map editor") { mapEditorScreen.game.setScreen(MainMenuScreen()); mapEditorScreen.dispose() }

3
core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
View File

@ -18,9 +18,8 @@ import kotlin.concurrent.thread
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
/** New map generation screen */
class NewMapScreen : PickerScreen() {
class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerScreen() {
private val mapParameters = MapParameters()
private val ruleset = RulesetCache.getBaseRuleset()
private var generatedMap: TileMap? = null