AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Play city-state music if available (#8727)

Browse Source 
* City-states now play their music if it exists
More of a fix than anything - before this city state music would only play when declare war button is confirmed

* City-states now play their music if it exists
More of a fix than anything - before this city state music would only play when declare war button is confirmed
This commit is contained in:
Skekdog 2023-02-23 07:31:23 +00:00 committed by GitHub
parent a31e74dee2
commit 145811849c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
View File

@ -167,6 +167,8 @@ class DiplomacyScreen(
private fun updateRightSide(otherCiv: Civilization) { private fun updateRightSide(otherCiv: Civilization) {
rightSideTable.clear() rightSideTable.clear()
UncivGame.Current.musicController.chooseTrack(otherCiv.civName,
MusicMood.peaceOrWar(viewingCiv.isAtWarWith(otherCiv)),MusicTrackChooserFlags.setSelectNation)
if (otherCiv.isCityState()) rightSideTable.add( if (otherCiv.isCityState()) rightSideTable.add(
ScrollPane(getCityStateDiplomacyTable(otherCiv)) ScrollPane(getCityStateDiplomacyTable(otherCiv))
) )
@ -696,9 +698,6 @@ class DiplomacyScreen(
if (promisesTable != null) diplomacyTable.add(promisesTable).row() if (promisesTable != null) diplomacyTable.add(promisesTable).row()
} }
UncivGame.Current.musicController.chooseTrack(otherCiv.civName,
MusicMood.peaceOrWar(viewingCiv.isAtWarWith(otherCiv)), MusicTrackChooserFlags.setSelectNation)
return diplomacyTable return diplomacyTable
} }