mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 16:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Go back to current game when you press "Resume" on the main menu (#6882)

Browse Source
This commit is contained in:
Timo T
2022-05-25 18:27:59 +02:00
committed by GitHub
parent 16874f5da6
commit 156db1f5f7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/MainMenuScreen.kt
View File

@ -28,6 +28,7 @@ import com.unciv.ui.popup.*
import com.unciv.ui.saves.LoadGameScreen import com.unciv.ui.saves.LoadGameScreen
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip
import com.unciv.ui.worldscreen.mainmenu.WorldScreenMenuPopup
class MainMenuScreen: BaseScreen() { class MainMenuScreen: BaseScreen() {
private val backgroundTable = Table().apply { background= ImageGetter.getBackground(Color.WHITE) } private val backgroundTable = Table().apply { background= ImageGetter.getBackground(Color.WHITE) }
@ -98,7 +99,7 @@ class MainMenuScreen: BaseScreen() {
if (game.gameSaver.autosaveExists()) { if (game.gameSaver.autosaveExists()) {
val resumeTable = getMenuButton("Resume","OtherIcons/Resume", 'r') val resumeTable = getMenuButton("Resume","OtherIcons/Resume", 'r')
{ autoLoadGame() } { resumeGame() }
column1.add(resumeTable).row() column1.add(resumeTable).row()
} }
@ -165,7 +166,14 @@ class MainMenuScreen: BaseScreen() {
} }
private fun autoLoadGame() { private fun resumeGame() {
val curWorldScreen = game.getWorldScreenOrNull()
if (curWorldScreen != null) {
game.resetToWorldScreen()
curWorldScreen.popups.filterIsInstance(WorldScreenMenuPopup::class.java).forEach(Popup::close)
return
}
val loadingPopup = Popup(this) val loadingPopup = Popup(this)
loadingPopup.addGoodSizedLabel("Loading...") loadingPopup.addGoodSizedLabel("Loading...")
loadingPopup.open() loadingPopup.open()