aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Program.cs
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-06-29 13:13:45 -0700
committerwilliam341 <[email protected]>2017-06-29 13:13:45 -0700
commitad387c41e7d6cc547431e88695d4723ea2dba913 (patch)
treea68282dda40c4f0b28883241c7adcf9010f4550e /ShiftOS.WinForms/Program.cs
parentb4b19e7a4d203b58537f5b98214296ab52c49b2d (diff)
parent5bebd4411bc6266cbee482a429ba794eefa8f9b6 (diff)
downloadshiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.gz
shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.bz2
shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms/Program.cs')
-rw-r--r--ShiftOS.WinForms/Program.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index d3530a0..c73f067 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -71,7 +71,7 @@ namespace ShiftOS.WinForms
Action completed = null;
completed = () =>
{
- SaveSystem.Ready = true;
+ SaveSystem.Ready.Set();
Engine.AudioManager.PlayCompleted -= completed;
AudioManager.StartAmbientLoop();
};
@@ -122,7 +122,7 @@ namespace ShiftOS.WinForms
{
var upgrade = new ShiftoriumUpgrade
{
- Id = attrib.Name.ToLower().Replace(" ", "_"),
+ Id = attrib.Upgrade,
Name = attrib.Name,
Description = attrib.Description,
Cost = attrib.Cost,