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

Fix nits

Browse Source
This commit is contained in:
Paul Chote
2011-05-12 20:33:53 +12:00
parent 61facc7bb1
commit 603379aa96
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Game.cs
View File

@@ -276,7 +276,8 @@ namespace OpenRA
ConnectionStateChanged = om => {};
BeforeGameStart = () => {};
AfterGameStart = w => {};
afterTickActions = new ActionQueue();
while (Widget.WindowList.Count > 0)
Widget.CloseWindow();
worldRenderer = null;
if (server != null)

20
OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs
View File

@@ -112,9 +112,12 @@ namespace OpenRA.Mods.Cnc.Widgets
var onError = (Action<string>)(s =>
{
statusLabel.GetText = () => "Error: "+s;
panel.GetWidget("RETRY_BUTTON").IsVisible = () => true;
panel.GetWidget("BACK_BUTTON").IsVisible = () => true;
Game.RunAfterTick(() =>
{
statusLabel.GetText = () => "Error: "+s;
panel.GetWidget("RETRY_BUTTON").IsVisible = () => true;
panel.GetWidget("BACK_BUTTON").IsVisible = () => true;
});
});
string source;
@@ -194,13 +197,16 @@ namespace OpenRA.Mods.Cnc.Widgets
Action<string> onExtractProgress = s =>
{
statusLabel.GetText = () => s;
Game.RunAfterTick(() => statusLabel.GetText = () => s);
};
Action<string> onError = s =>
{
statusLabel.GetText = () => "Error: "+s;
retryButton.IsVisible = () => true;
Game.RunAfterTick(() =>
{
statusLabel.GetText = () => "Error: "+s;
retryButton.IsVisible = () => true;
});
};
Action<AsyncCompletedEventArgs, bool> onDownloadComplete = (i, cancelled) =>
@@ -211,8 +217,6 @@ namespace OpenRA.Mods.Cnc.Widgets
var except = i.Error as System.Net.WebException;
if (except != null)
{
Console.WriteLine("{0}",except.Status);
if (except.Status == WebExceptionStatus.ProtocolError)
message = "File not found on remote server";
else if (except.Status == WebExceptionStatus.NameResolutionFailure ||

39
OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs
View File

@@ -220,21 +220,25 @@ namespace OpenRA.Mods.Cnc.Widgets
{
progressBar.SetIndeterminate(true);
statusLabel.GetText = () => "Waiting for file";
Game.Utilities.PromptFilepathAsync("Select SCORES.MIX on the C&C CD", path => Game.RunAfterTick(() => Install(path)));
Game.Utilities.PromptFilepathAsync("Select SCORES.MIX on the C&C CD", path => Install(path));
}
void Install(string path)
public void OnError(string message)
{
var dest = new string[] { Platform.SupportDir, "Content", "cnc" }.Aggregate(Path.Combine);
var onError = (Action<string>)(s =>
Game.RunAfterTick(() =>
{
progressBar.SetIndeterminate(false);
statusLabel.GetText = () => "Error: "+s;
statusLabel.GetText = () => "Error: "+message;
panel.GetWidget("RETRY_BUTTON").IsVisible = () => true;
panel.GetWidget("BACK_BUTTON").IsVisible = () => true;
});
}
void Install(string path)
{
var dest = new string[] { Platform.SupportDir, "Content", "cnc" }.Aggregate(Path.Combine);
Game.RunAfterTick(() => statusLabel.GetText = () => "Installing");
// Mount the package and check that it contains the correct files
try
{
@@ -242,34 +246,33 @@ namespace OpenRA.Mods.Cnc.Widgets
if (!mixFile.Exists("aoi.aud"))
{
onError("Not the C&C SCORES.MIX");
OnError("Not the C&C SCORES.MIX");
return;
}
statusLabel.GetText = () => "Installing";
var t = new Thread( _ =>
{
var destPath = Path.Combine(dest, "scores.mix");
try
{
File.Copy(path, destPath, true);
Game.RunAfterTick(() =>
{
Widget.CloseWindow(); // Progress panel
afterInstall(destPath);
});
}
catch
catch (Exception e)
{
onError("File copy failed");
OnError("File copy failed");
Log.Write("debug", e.Message);
}
Game.RunAfterTick(() =>
{
Widget.CloseWindow(); // Progress panel
afterInstall(destPath);
});
}) { IsBackground = true };
t.Start();
}
catch
{
onError("Invalid mix file");
OnError("Invalid mix file");
}
}
}