curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 20:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop-callback from disposed musicgovernor killing the newly queued music

Browse Source
This commit is contained in:
minjaesong
2023-11-09 16:29:22 +09:00
parent ce5f3d548b
commit 125bacfeb9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
View File

@@ -58,7 +58,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
private fun stopMusic() { private fun stopMusic() {
AudioManager.stopMusic() // AudioManager.stopMusic() // music will stop itself; with this line not commented, the stop-callback from the already disposed musicgovernor will stop the music queued by the new musicgovernor instance
state = STATE_INTERMISSION state = STATE_INTERMISSION
intermissionAkku = 0f intermissionAkku = 0f
intermissionLength = 30f + 30f * Math.random().toFloat() // 30s-60s intermissionLength = 30f + 30f * Math.random().toFloat() // 30s-60s
@@ -117,6 +117,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
} }
override fun dispose() { override fun dispose() {
AudioManager.stopMusic() // explicit call for fade-out when the game instance quits
stopMusic() stopMusic()
} }
} }