tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-31 01:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't log music missing when checking night music

Browse Source
This commit is contained in:
JappaWakka 2025-03-17 17:34:20 +01:00
parent 5012313ca8
commit 62fbec7c43
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,8 +508,8 @@ Public Class MusicManager
End Function
Public Shared Function SongExists(songName As String) As Boolean
Return Not GetSong(songName) Is Nothing
Public Shared Function SongExists(songName As String, Optional LogIfNotFound As Boolean = True) As Boolean
Return Not GetSong(songName, LogIfNotFound) Is Nothing
End Function
Private Shared Function GetCurrentSong() As String
@ -551,7 +551,7 @@ Public Class MusicManager
End If
End Function
Public Shared Function GetSong(songName As String) As SongContainer
Public Shared Function GetSong(songName As String, Optional LogIfNotFound As Boolean = True) As SongContainer
Dim key = GetSongName(songName)
Dim cContent As ContentManager = ContentPackManager.GetContentManager("Songs\" & key, ".ogg,.mp3,.wma")
Dim contentSongFilePath = GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & key
@ -587,7 +587,9 @@ Public Class MusicManager
If GameController.IS_DEBUG_ACTIVE = True Then
Logger.Debug("MusicManager.vb: Cannot find music file """ & songName & """. Return nothing.")
ElseIf songName.Contains("intro\") = False Then
Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: Cannot find music file """ & songName & """. Return nothing.")
If LogIfNotFound = True Then
Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: Cannot find music file """ & songName & """. Return nothing.")
End If
End If
End If
Return Nothing

2
P3D/Screens/BattleIntroScreen.vb
View File

@ -654,7 +654,7 @@
End Function
Private Function ShouldPlayNightTheme(dayThemeName As String) As Boolean
Return World.IsNight() And MusicManager.SongExists(dayThemeName & "_night")
Return World.IsNight() And MusicManager.SongExists(dayThemeName & "_night", False)
End Function
'Protected Overrides Sub Finalize()