Fixed all known, noticeable bugs related to music in the engine.
This commit is contained in:
parent
a5ef3c1513
commit
83570f5789
|
@ -419,7 +419,7 @@ Public Class OverworldScreen
|
||||||
Level.IsRadioOn = False
|
Level.IsRadioOn = False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
MusicManager.Play(theme, True)
|
MusicManager.Play(theme, True) 'remove when debugging music
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ Public Class MusicManager
|
||||||
_fadeIntoIntro = False
|
_fadeIntoIntro = False
|
||||||
_introEndTime = Date.Now.AddSeconds(0) + song.Song.Duration
|
_introEndTime = Date.Now.AddSeconds(0) + song.Song.Duration
|
||||||
_isIntroStarted = True
|
_isIntroStarted = True
|
||||||
MediaPlayer.IsRepeating = False
|
'MediaPlayer.IsRepeating = False
|
||||||
Else
|
Else
|
||||||
MediaPlayer.IsRepeating = True
|
MediaPlayer.IsRepeating = True
|
||||||
End If
|
End If
|
||||||
|
@ -263,7 +263,7 @@ Public Class MusicManager
|
||||||
' setup the continue song
|
' setup the continue song
|
||||||
_introContinueSong = songName
|
_introContinueSong = songName
|
||||||
' do not repeat media player, do not want intro to loop
|
' do not repeat media player, do not want intro to loop
|
||||||
MediaPlayer.IsRepeating = False
|
'MediaPlayer.IsRepeating = False
|
||||||
|
|
||||||
If fadeSpeed > 0F Then
|
If fadeSpeed > 0F Then
|
||||||
_isIntroStarted = False
|
_isIntroStarted = False
|
||||||
|
@ -279,9 +279,13 @@ Public Class MusicManager
|
||||||
|
|
||||||
' load the next song so the end of the intro doesn't lag
|
' load the next song so the end of the intro doesn't lag
|
||||||
GetSong(song)
|
GetSong(song)
|
||||||
|
Else
|
||||||
|
_isIntroStarted = False
|
||||||
|
_fadeIntoIntro = False
|
||||||
End If
|
End If
|
||||||
|
Else
|
||||||
|
_isIntroStarted = False
|
||||||
|
_fadeIntoIntro = False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' intro was not requested or does not exist
|
' intro was not requested or does not exist
|
||||||
|
|
|
@ -506,7 +506,7 @@
|
||||||
Player.Temp.BeforeBattleLevelFile = Screen.Level.LevelFile
|
Player.Temp.BeforeBattleLevelFile = Screen.Level.LevelFile
|
||||||
Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
|
Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
|
||||||
MusicManager.Play(MusicLoop, False, 0F)
|
MusicManager.Play(MusicLoop, False, 0F)
|
||||||
MediaPlayer.IsRepeating = False
|
'MediaPlayer.IsRepeating = False
|
||||||
|
|
||||||
If Not MusicManager.CurrentSong Is Nothing Then
|
If Not MusicManager.CurrentSong Is Nothing Then
|
||||||
Me.duration = MusicManager.CurrentSong.Song.Duration
|
Me.duration = MusicManager.CurrentSong.Song.Duration
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue