AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Memory-saving tweak

Browse Source
This commit is contained in:
Yair Morgenstern 2019-03-10 23:04:04 +02:00
parent 115aef50ad
commit 881f532bf7
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/UnCivGame.kt
View File

@ -58,6 +58,7 @@ class UnCivGame : Game() {
} }
fun setWorldScreen() { fun setWorldScreen() {
if(screen != null && screen != worldScreen) screen.dispose()
setScreen(worldScreen) setScreen(worldScreen)
Gdx.input.inputProcessor = worldScreen.stage Gdx.input.inputProcessor = worldScreen.stage
worldScreen.shouldUpdate=true // This can set the screen to the policy picker or tech picker screen, so the input processor must come before worldScreen.shouldUpdate=true // This can set the screen to the policy picker or tech picker screen, so the input processor must come before

2
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -17,7 +17,7 @@ import java.util.*
class CivilopediaScreen : CameraStageBaseScreen() { class CivilopediaScreen : CameraStageBaseScreen() {
init { init {
onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
val buttonTable = Table() val buttonTable = Table()
buttonTable.pad(15f) buttonTable.pad(15f)
val entryTable = Table() val entryTable = Table()

2
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -22,7 +22,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
val currentPlayerCivInfo = UnCivGame.Current.gameInfo.getCurrentPlayerCivilization() val currentPlayerCivInfo = UnCivGame.Current.gameInfo.getCurrentPlayerCivilization()
init { init {
onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
val topTable = Table().apply { defaults().pad(10f) } val topTable = Table().apply { defaults().pad(10f) }
val centerTable=Table().apply { defaults().pad(20f) } val centerTable=Table().apply { defaults().pad(20f) }

2
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -42,7 +42,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
private var tileGroups = ArrayList<CityTileGroup>() private var tileGroups = ArrayList<CityTileGroup>()
init { init {
onBackButtonClicked { game.setWorldScreen(); dispose() } onBackButtonClicked { game.setWorldScreen() }
addTiles() addTiles()
val tableBackgroundColor = ImageGetter.getBlue().lerp(Color.BLACK,0.5f) val tableBackgroundColor = ImageGetter.getBlue().lerp(Color.BLACK,0.5f)

2
core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
View File

@ -27,7 +27,7 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen(
rightSideButton.setText("Adopt free policy".tr()) rightSideButton.setText("Adopt free policy".tr())
closeButton.disable() closeButton.disable()
} }
else onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } else onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
rightSideButton.onClick("policy") { rightSideButton.onClick("policy") {
civInfo.policies.adopt(pickedPolicy!!) civInfo.policies.adopt(pickedPolicy!!)

2
core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
View File

@ -16,7 +16,7 @@ class PromotionPickerScreen(mapUnit: MapUnit) : PickerScreen() {
init { init {
onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
setDefaultCloseAction() setDefaultCloseAction()
rightSideButton.setText("Pick promotion".tr()) rightSideButton.setText("Pick promotion".tr())
rightSideButton.onClick("promote") { rightSideButton.onClick("promote") {

2
core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
View File

@ -40,7 +40,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
init { init {
setDefaultCloseAction() setDefaultCloseAction()
onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
tempTechsToResearch = ArrayList(civTech.techsToResearch) tempTechsToResearch = ArrayList(civTech.techsToResearch)

2
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -14,7 +14,7 @@ class DiplomacyScreen:CameraStageBaseScreen(){
val rightSideTable = Table() val rightSideTable = Table()
init{ init{
onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
val splitPane = SplitPane(ScrollPane(leftSideTable),rightSideTable,false, skin) val splitPane = SplitPane(ScrollPane(leftSideTable),rightSideTable,false, skin)
splitPane.splitAmount = 0.2f splitPane.splitAmount = 0.2f