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

fix double-playing of music, etc.

Browse Source
This commit is contained in:
Chris Forbes
2010-05-05 20:00:54 +12:00
parent 5cdc47ea6b
commit 39920499e0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Sound.cs
View File

@@ -79,6 +79,9 @@ namespace OpenRA
if (name == "" || name == null) if (name == "" || name == null)
return; return;
if (music != null)
soundEngine.StopSound(music);
var sound = sounds[name]; var sound = sounds[name];
music = soundEngine.Play2D(sound, true); music = soundEngine.Play2D(sound, true);
music.Volume = musicVolume; music.Volume = musicVolume;

4
OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
View File

@@ -26,11 +26,11 @@ namespace OpenRA.Widgets.Delegates
{ {
var r = Chrome.rootWidget; var r = Chrome.rootWidget;
r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => { r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => {
r.CloseWindow(); Game.Disconnect();
return true; return true;
}; };
r.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => { r.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => {
r.CloseWindow(); Game.Disconnect();
return true; return true;
}; };
r.GetWidget("CONNECTION_BUTTON_RETRY").OnMouseUp = mi => { r.GetWidget("CONNECTION_BUTTON_RETRY").OnMouseUp = mi => {

1
OpenRA.Game/Widgets/Widget.cs
View File

@@ -209,6 +209,7 @@ namespace OpenRA.Widgets
public void CloseWindow() public void CloseWindow()
{ {
Chrome.rootWidget.GetWidget(WindowList.Pop()).Visible = false; Chrome.rootWidget.GetWidget(WindowList.Pop()).Visible = false;
if (WindowList.Count > 0)
Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = true; Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = true;
} }