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

don't hide the pause button after unpause

Browse Source
This commit is contained in:
Matthias Mailänder
2013-07-25 23:30:27 +02:00
parent fa84f1906f
commit 06233a76a8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Sound.cs
View File

@@ -165,12 +165,14 @@ namespace OpenRA
if (m == currentMusic && music != null) if (m == currentMusic && music != null)
{ {
soundEngine.PauseSound(music, false); soundEngine.PauseSound(music, false);
MusicPlaying = true;
return; return;
} }
StopMusic(); StopMusic();
var sound = sounds[m.Filename]; var sound = sounds[m.Filename];
if (sound == null) return; if (sound == null)
return;
music = soundEngine.Play2D(sound, false, true, float2.Zero, MusicVolume, false); music = soundEngine.Play2D(sound, false, true, float2.Zero, MusicVolume, false);
currentMusic = m; currentMusic = m;
@@ -570,7 +572,8 @@ namespace OpenRA
public void PauseSound(ISound sound, bool paused) public void PauseSound(ISound sound, bool paused)
{ {
if (sound == null) return; if (sound == null)
return;
int key = ((OpenAlSound)sound).source; int key = ((OpenAlSound)sound).source;
int state; int state;
@@ -591,7 +594,6 @@ namespace OpenRA
Al.alSourcePause(key); Al.alSourcePause(key);
else if (state == Al.AL_PAUSED && !paused) else if (state == Al.AL_PAUSED && !paused)
Al.alSourcePlay(key); Al.alSourcePlay(key);
} }
} }