epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix IDE0032

Browse Source
This commit is contained in:
RoosterDragon
2023-02-19 11:19:28 +00:00
committed by Pavel Penev
parent e64c0a35c5
commit 98c4eaca83
52 changed files with 460 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Sound/Sound.cs
View File

@@ -43,7 +43,6 @@ namespace OpenRA
ISoundSource videoSource;
ISound music;
ISound video;
MusicInfo currentMusic;
readonly Dictionary<uint, ISound> currentSounds = new Dictionary<uint, ISound>();
readonly Dictionary<string, ISound> currentNotifications = new Dictionary<string, ISound>();
public bool DummyEngine { get; }
@@ -226,7 +225,7 @@ namespace OpenRA
Action onMusicComplete;
public bool MusicPlaying { get; private set; }
public MusicInfo CurrentMusic => currentMusic;
public MusicInfo CurrentMusic { get; private set; }
public void PlayMusicThen(MusicInfo m, Action then)
{
@@ -235,7 +234,7 @@ namespace OpenRA
onMusicComplete = then;
if (m == currentMusic && music != null)
if (m == CurrentMusic && music != null)
{
soundEngine.PauseSound(music, false);
MusicPlaying = true;
@@ -263,7 +262,7 @@ namespace OpenRA
return;
}
currentMusic = m;
CurrentMusic = m;
MusicPlaying = true;
}
@@ -290,7 +289,7 @@ namespace OpenRA
music = null;
}
currentMusic = null;
CurrentMusic = null;
MusicPlaying = false;
}