diff --git a/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt index 70e189a898..e171adcefb 100644 --- a/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt +++ b/core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt @@ -102,11 +102,11 @@ class CityInfoConquestFunctions(val city: City){ conqueringCiv.addNotification("Received [$goldPlundered] Gold for capturing [$name]", getCenterTile().position, NotificationCategory.General, NotificationIcon.Gold) - val reconqueredCityWhileStillInResistance = previousOwner == conqueringCiv.civName && isInResistance() + val reconqueredCityWhileStillInResistance = previousOwner == receivingCiv.civName && isInResistance() destroyBuildingsOnCapture() - this@CityInfoConquestFunctions.moveToCiv(receivingCiv) + moveToCiv(receivingCiv) Battle.destroyIfDefeated(conqueredCiv, conqueringCiv) @@ -326,8 +326,7 @@ class CityInfoConquestFunctions(val city: City){ cityStats.update() // Update proximity rankings - civ.updateProximity(oldCiv, - oldCiv.updateProximity(civ)) + civ.updateProximity(oldCiv, oldCiv.updateProximity(civ)) // Update history city.getTiles().forEach { tile -> diff --git a/core/src/com/unciv/ui/popups/Popup.kt b/core/src/com/unciv/ui/popups/Popup.kt index 7e8a4d934c..a90a0d6ee7 100644 --- a/core/src/com/unciv/ui/popups/Popup.kt +++ b/core/src/com/unciv/ui/popups/Popup.kt @@ -266,8 +266,8 @@ open class Popup( * @param text The caption text. * @param size The font size for the label. */ - fun addGoodSizedLabel(text: String, size: Int = Constants.defaultFontSize): Cell