tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-26 23:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix a music volume bug

Browse Source
This commit is contained in:
JappaWakka 2023-07-21 19:30:18 +02:00
parent 916c69d2b0
commit 71bd0eaaef
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ Public Class MusicManager
Public Shared audioFileWMA As MediaFoundationReader Public Shared audioFileWMA As MediaFoundationReader
Public Shared _stream As WaveChannel32 Public Shared _stream As WaveChannel32
Public Shared Property PauseVolume As Single = 1.0F
Public Shared Property MasterVolume As Single = 1.0F Public Shared Property MasterVolume As Single = 1.0F
Public Shared ReadOnly Property CurrentSong As SongContainer Public Shared ReadOnly Property CurrentSong As SongContainer
Get Get
@ -300,15 +301,15 @@ Public Class MusicManager
'End If 'End If
End If End If
End If End If
If Core.GameInstance.IsActive AndAlso _lastVolume <> (Volume * MasterVolume) Then If Core.GameInstance.IsActive AndAlso _lastVolume <> (Volume * PauseVolume * MasterVolume) Then
UpdateVolume() UpdateVolume()
End If End If
End Sub End Sub
Public Shared Sub UpdateVolume() Public Shared Sub UpdateVolume()
_lastVolume = Volume * MasterVolume _lastVolume = Volume * PauseVolume * MasterVolume
If Not _stream Is Nothing Then If Not _stream Is Nothing Then
_stream.Volume = Volume * MasterVolume _stream.Volume = Volume * PauseVolume * MasterVolume
End If End If
End Sub End Sub
@ -703,8 +704,8 @@ Public Class MusicManager
{ {
{"welcome", "RouteMusic1"}, {"welcome", "RouteMusic1"},
{"battle", "johto_wild"}, {"battle", "johto_wild"},
{"batleintro", "battle_intro"}, {"batleintro", "johto_wild_intro"},
{"johto_battle_intro", "battle_intro"}, {"johto_battle_intro", "johto_wild_intro"},
{"darkcave", "dark_cave"}, {"darkcave", "dark_cave"},
{"showmearound", "show_me_around"}, {"showmearound", "show_me_around"},
{"sprouttower", "sprout_tower"}, {"sprouttower", "sprout_tower"},

4
P3D/Screens/MainMenu/PauseScreen.vb
View File

@ -323,12 +323,12 @@
End Sub End Sub
Public Overrides Sub ChangeTo() Public Overrides Sub ChangeTo()
MusicManager.MasterVolume /= 4 MusicManager.PauseVolume = 0.25F
MusicManager.UpdateVolume() MusicManager.UpdateVolume()
End Sub End Sub
Public Overrides Sub ChangeFrom() Public Overrides Sub ChangeFrom()
MusicManager.MasterVolume *= 4 MusicManager.PauseVolume = 1.0F
MusicManager.UpdateVolume() MusicManager.UpdateVolume()
End Sub End Sub
End Class End Class