mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 04:38:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Facism -> Fascism policy name change in existing save files

Browse Source
This commit is contained in:
Yair Morgenstern
2019-12-08 18:44:04 +02:00
parent cdcd7cf116
commit 9725c0f66c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/GameInfo.kt
View File

@ -224,6 +224,12 @@ class GameInfo {
// which in turn leads to us trying to get info on all the building in all the cities...
// which can fail if there's an "unregistered" building anywhere
for (civInfo in civilizations) {
// As of 3.5.
if(civInfo.policies.adoptedPolicies.contains("Facism")){
civInfo.policies.adoptedPolicies.remove("Facism")
civInfo.policies.adoptedPolicies.add("Fascism")
}
for (cityInfo in civInfo.cities) {
val cityConstructions = cityInfo.cityConstructions

15
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View File

@ -24,15 +24,14 @@ open class CameraStageBaseScreen : Screen {
init {
val width:Float
val height:Float
if(game.settings.resolution=="Auto"){
if(game.settings.resolution=="Auto") {
// lower than 750x500 just doesn't manage to fit all the components into the screen
if(Gdx.graphics.width >= 750 && Gdx.graphics.height.toFloat() >= 500){
width=Gdx.graphics.width.toFloat()
height=Gdx.graphics.height.toFloat()
}
else{
width=750f
height=500f
if (Gdx.graphics.width >= 750 && Gdx.graphics.height.toFloat() >= 500) {
width = Gdx.graphics.width.toFloat()
height = Gdx.graphics.height.toFloat()
} else {
width = 750f
height = 500f
}
}
else {