From e5e0c5daa5a8cf91a974ab1e677ba76a0a830924 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 5 Apr 2018 11:19:31 +0300 Subject: [PATCH] Now displays defender name properly, and not attacker name --- android/build.gradle | 4 ++-- core/src/com/unciv/ui/worldscreen/BattleTable.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a1ea484f86..293c15c035 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 34 - versionName "1.4.1" + versionCode 35 + versionName "1.4.2" } buildTypes { release { diff --git a/core/src/com/unciv/ui/worldscreen/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/BattleTable.kt index 5d16b99ac0..3794cb115d 100644 --- a/core/src/com/unciv/ui/worldscreen/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/BattleTable.kt @@ -48,7 +48,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() { attackerLabel.style.fontColor=attacker.getCivilization().getCivilization().getColor() add(attackerLabel) - val defenderLabel = Label(attacker.getName(), skin) + val defenderLabel = Label(defender.getName(), skin) defenderLabel.style= Label.LabelStyle(defenderLabel.style) defenderLabel.style.fontColor=defender.getCivilization().getCivilization().getColor() add(defenderLabel)