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

Energy saving: music and sounds (#2128)

Browse Source
This commit is contained in:
Jack Rainy
2020-03-12 08:35:45 +02:00
committed by GitHub
parent 528392baab
commit c7e8dfb8fb
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/UncivGame.kt
View File

@ -96,7 +96,7 @@ class UncivGame(
Gdx.app.postRunnable { Gdx.app.postRunnable {
CameraStageBaseScreen.resetFonts() CameraStageBaseScreen.resetFonts()
autoLoadGame() autoLoadGame()
thread { startMusic() } thread(name="Music") { startMusic() }
isInitialized = true isInitialized = true
} }
} }
@ -114,6 +114,7 @@ class UncivGame(
} }
fun startMusic() { fun startMusic() {
if (settings.musicVolume < 0.01) return
val musicFile = Gdx.files.local(musicLocation) val musicFile = Gdx.files.local(musicLocation)
if (musicFile.exists()) { if (musicFile.exists()) {

5
core/src/com/unciv/ui/utils/Sounds.kt
View File

@ -16,7 +16,8 @@ object Sounds {
} }
fun play(sound: UncivSound) { fun play(sound: UncivSound) {
if (sound == UncivSound.Silent) return val volume = UncivGame.Current.settings.soundEffectsVolume
get(sound).play(UncivGame.Current.settings.soundEffectsVolume) if (sound == UncivSound.Silent || volume < 0.01) return
get(sound).play(volume)
} }
} }

7
core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt
View File

@ -201,7 +201,12 @@ class WorldScreenOptionsPopup(val worldScreen:WorldScreen) : Popup(worldScreen){
override fun changed(event: ChangeEvent?, actor: Actor?) { override fun changed(event: ChangeEvent?, actor: Actor?) {
UncivGame.Current.settings.musicVolume = musicVolumeSlider.value UncivGame.Current.settings.musicVolume = musicVolumeSlider.value
UncivGame.Current.settings.save() UncivGame.Current.settings.save()
UncivGame.Current.music?.volume = 0.4f * musicVolumeSlider.value
val music = UncivGame.Current.music
if (music == null) // restart music, if it was off at the app start
thread(name="Music") { UncivGame.Current.startMusic() }
music?.volume = 0.4f * musicVolumeSlider.value
} }
}) })
innerTable.add(musicVolumeSlider).pad(10f).row() innerTable.add(musicVolumeSlider).pad(10f).row()