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

Now displays defender name properly, and not attacker name

Browse Source
This commit is contained in:
Yair Morgenstern
2018-04-05 11:19:31 +03:00
parent 461bea0cbc
commit e5e0c5daa5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 34 versionCode 35
versionName "1.4.1" versionName "1.4.2"
} }
buildTypes { buildTypes {
release { release {

2
core/src/com/unciv/ui/worldscreen/BattleTable.kt
View File

@ -48,7 +48,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
attackerLabel.style.fontColor=attacker.getCivilization().getCivilization().getColor() attackerLabel.style.fontColor=attacker.getCivilization().getCivilization().getColor()
add(attackerLabel) add(attackerLabel)
val defenderLabel = Label(attacker.getName(), skin) val defenderLabel = Label(defender.getName(), skin)
defenderLabel.style= Label.LabelStyle(defenderLabel.style) defenderLabel.style= Label.LabelStyle(defenderLabel.style)
defenderLabel.style.fontColor=defender.getCivilization().getCivilization().getColor() defenderLabel.style.fontColor=defender.getCivilization().getCivilization().getColor()
add(defenderLabel) add(defenderLabel)