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

read sound effects from RAM

Browse Source
This commit is contained in:
minjaesong
2024-04-02 14:32:13 +09:00
parent 53f54a450d
commit 918276a1be
12 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/gameactors/ActorPrimedBomb.kt
View File

@@ -34,17 +34,17 @@ open class ActorPrimedBomb(
private var explosionCalled = false
@Transient private val boomSound = MusicContainer(
"boom", ModMgr.getFile("basegame", "audio/effects/explosion/bang_bomb.ogg")
"boom", ModMgr.getFile("basegame", "audio/effects/explosion/bang_bomb.ogg"), toRAM = true
) {
this.flagDespawn()
}
@Transient private val fuseSound = MusicContainer(
"fuse", ModMgr.getFile("basegame", "audio/effects/explosion/fuse.ogg")
"fuse", ModMgr.getFile("basegame", "audio/effects/explosion/fuse.ogg"), toRAM = true
) {
this.flagDespawn()
}
@Transient private val fuseSoundCont = MusicContainer(
"fuse_continue", ModMgr.getFile("basegame", "audio/effects/explosion/fuse_continue.ogg")
"fuse_continue", ModMgr.getFile("basegame", "audio/effects/explosion/fuse_continue.ogg"), toRAM = true
) {
this.flagDespawn()
}

2
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
View File

@@ -130,7 +130,7 @@ class FixtureJukebox : Electric, PlaysMusic {
musicNowPlaying = MusicContainer(title, musicFile.file()) {
unloadEffector(musicNowPlaying)
discCurrentlyPlaying = null
musicNowPlaying?.gdxMusic?.tryDispose()
musicNowPlaying?.tryDispose()
musicNowPlaying = null
printdbg(this, "Stop music $title - $artist")

2
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt
View File

@@ -115,7 +115,7 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
musicNowPlaying = MusicContainer(title, musicFile.file()) {
unloadEffector(musicNowPlaying)
musicNowPlaying?.gdxMusic?.tryDispose()
musicNowPlaying?.tryDispose()
musicNowPlaying = null
App.printdbg(this, "Stop music $title - $artist")