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

Fixed some bugs related to song intros duration.

This commit is contained in:
CaptainSegis 2018-03-04 15:21:47 -05:00
parent f958ec2e58
commit 664168e6ba
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ Public Class MusicManager
If _fadeIntoIntro Then If _fadeIntoIntro Then
_fadeIntoIntro = False _fadeIntoIntro = False
_introEndTime = Date.Now.AddSeconds(-1) + song.Duration _introEndTime = Date.Now.AddSeconds(0) + song.Duration
_isIntroStarted = True _isIntroStarted = True
MediaPlayer.IsRepeating = False MediaPlayer.IsRepeating = False
Else Else
@ -271,7 +271,7 @@ Public Class MusicManager
FadeInto(introSong, fadeSpeed) FadeInto(introSong, fadeSpeed)
Else Else
_isIntroStarted = True _isIntroStarted = True
_introEndTime = Date.Now.AddSeconds(-1) + introSong.Duration _introEndTime = Date.Now.AddSeconds(0) + introSong.Duration
Play(introSong) Play(introSong)
End If End If

2
P3D/Screens/BattleIntroScreen.vb
View File

@ -505,7 +505,7 @@
Player.Temp.BeforeBattlePosition = Screen.Camera.Position Player.Temp.BeforeBattlePosition = Screen.Camera.Position
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) 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

BIN
lib/build/Pokemon3D.exe
View File

Binary file not shown.