tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added argument to play a song that doesn't loop

This commit is contained in:
JappaWakka 2022-10-18 16:02:28 +02:00
parent d74103073d
commit 57e145b668
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P3D/Resources/Sound/MusicManager.vb
View File

@ -321,6 +321,7 @@ Public Class MusicManager
End Sub End Sub
Public Shared Sub [Stop]() Public Shared Sub [Stop]()
Playlist.Clear()
MusicManager.Play(NO_MUSIC, False, 0.0F) MusicManager.Play(NO_MUSIC, False, 0.0F)
_isIntroStarted = False _isIntroStarted = False
End Sub End Sub

12
P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb
View File

@ -12,11 +12,21 @@
Select Case command.ToLower() Select Case command.ToLower()
Case "play" Case "play"
MusicManager.Play(argument, True) Dim LoopSong As Boolean = True
If argument.Split(",").Length > 1 Then
LoopSong = CBool(argument.GetSplit(1, ","))
End If
MusicManager.Play(argument.GetSplit(0, ","), LoopSong, LoopSong)
If LoopSong = True Then
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
Screen.Level.MusicLoop = argument Screen.Level.MusicLoop = argument
End If End If
Else
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
Screen.Level.MusicLoop = "silence"
End If
End If
Case "forceplay" Case "forceplay"
MusicManager.ClearCurrentlyPlaying() MusicManager.ClearCurrentlyPlaying()
MusicManager.Play(argument) MusicManager.Play(argument)