shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various intro fixes.

Browse source
This commit is contained in:
Michael 2017-04-29 18:59:20 -04:00
parent 7293e2f07f
commit 12490dec7d
4 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShiftOS.WinForms/Oobe.cs
View file

@ -261,7 +261,10 @@ You must join the digital society, rise up the ranks, and save us.
{
Utils.Delete(Paths.GetPath("user.dat"));
}
Application.Restart();
string json = Utils.ExportMount(0);
System.IO.File.WriteAllText(Paths.SaveFile, json);
System.Diagnostics.Process.Start(Application.ExecutablePath);
Environment.Exit(0);
}
});

6
ShiftOS.WinForms/OobeStory.cs
View file

@ -205,7 +205,11 @@ namespace ShiftOS.WinForms
while (position == 0)
Thread.Sleep(10);
Console.WriteLine("Connecting to the multi-user domain as " + SaveSystem.CurrentSave.SystemName + "...");
bool connected = false;
Engine.AudioManager.PlayCompleted += () => { connected = true; };
Engine.AudioManager.PlayStream(Properties.Resources.dial_up_modem_02);
while (connected == false)
Thread.Sleep(10);
Console.WriteLine("Connection successful, system spinning up...");
Thread.Sleep(200);
UsernameWait:
@ -299,6 +303,8 @@ namespace ShiftOS.WinForms
TerminalBackend.PrintPrompt();
Console.Write("sos.help");
TerminalBackend.InvokeCommand("sos.help");
Thread.Sleep(1000);
TerminalBackend.PrintPrompt();
};
}
});

4
ShiftOS.WinForms/WindowBorder.cs
View file

@ -257,6 +257,7 @@ namespace ShiftOS.WinForms
{
this.DoubleBuffered = true;
this.TransparencyKey = LoadedSkin.SystemKey;
pnlcontents.BackColor = this.TransparencyKey;
pnltitle.Height = LoadedSkin.TitlebarHeight;
pnltitle.BackColor = LoadedSkin.TitleBackgroundColor;
pnltitle.BackgroundImage = GetImage("titlebar");
@ -504,7 +505,9 @@ namespace ShiftOS.WinForms
private void pnlright_MouseDown(object sender, MouseEventArgs e)
{
if (Shiftorium.UpgradeInstalled("resizable_windows"))
{
resizing = true;
}
}
private void pnlright_MouseMove(object sender, MouseEventArgs e)
@ -518,6 +521,7 @@ namespace ShiftOS.WinForms
private void pnlright_MouseUp(object sender, MouseEventArgs e)
{
resizing = false;
pnlcontents.Show();
}
private void pnlleft_MouseMove(object sender, MouseEventArgs e)

3
ShiftOS_TheReturn/AudioManager.cs
View file

@ -87,6 +87,7 @@ namespace ShiftOS.Engine
_out.Init(_reader);
_out.Volume = _provider.Volume;
_out.Play();
_out.PlaybackStopped += (o, a) => { PlayCompleted?.Invoke(); };
}
catch { }
}
@ -107,6 +108,8 @@ namespace ShiftOS.Engine
ShiftOS.Engine.AudioManager.Play("snd.wav");
}
public static event Action PlayCompleted;
}
public interface IAudioProvider