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

Fixed crash on unloadable sounds

Browse Source
This commit is contained in:
yairm210 2025-07-23 16:22:23 +03:00
parent 2f92bedb52
commit 43b8b12131
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/com/unciv/ui/audio/SoundPlayer.kt
View File

@ -117,13 +117,13 @@ object SoundPlayer {
} }
/** Holds a Gdx Sound and a flag indicating the sound is freshly loaded and not from cache */ /** Holds a Gdx Sound and a flag indicating the sound is freshly loaded and not from cache */
private data class GetSoundResult(val resource: Sound, val isFresh: Boolean) data class GetSoundResult(val resource: Sound, val isFresh: Boolean)
/** Retrieve (if not cached create from resources) a Gdx Sound from an UncivSound /** Retrieve (if not cached create from resources) a Gdx Sound from an UncivSound
* @param sound The sound to fetch * @param sound The sound to fetch
* @return `null` if file cannot be found, a [GetSoundResult] otherwise * @return `null` if file cannot be found, a [GetSoundResult] otherwise
*/ */
private fun get(sound: UncivSound): GetSoundResult? { fun get(sound: UncivSound): GetSoundResult? {
checkCache() checkCache()
// Look for cached sound // Look for cached sound
@ -158,10 +158,17 @@ object SoundPlayer {
} }
debug("Sound %s loaded from %s", sound.fileName, file.path()) debug("Sound %s loaded from %s", sound.fileName, file.path())
val newSound = Gdx.audio.newSound(file) try {
// Store Sound for reuse val newSound = Gdx.audio.newSound(file)
soundMap[sound] = newSound // Store Sound for reuse
return GetSoundResult(newSound, true) soundMap[sound] = newSound
return GetSoundResult(newSound, true)
} catch (e: Exception) {
debug("Failed to create a sound %s from %s: %s", sound.fileName, file.path(), e.message)
// remember that the actual file is missing
soundMap[sound] = null
return null
}
} }
/** Play a sound once. Will not play if the sound is [UncivSound.Silent] or the volume is too low. /** Play a sound once. Will not play if the sound is [UncivSound.Silent] or the volume is too low.