aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-04-18 16:22:18 -0400
committerMichael <[email protected]>2017-04-19 09:04:47 -0400
commit7ec8c68784ab718ecf5dbfc34d7816f660c8ba8d (patch)
tree5b62e73582afc49aac03b1a585a1df2bd266de05
parent22f56fa4fd0e89d96f892a9c2575ae6867daf687 (diff)
downloadshiftos_thereturn-7ec8c68784ab718ecf5dbfc34d7816f660c8ba8d.tar.gz
shiftos_thereturn-7ec8c68784ab718ecf5dbfc34d7816f660c8ba8d.tar.bz2
shiftos_thereturn-7ec8c68784ab718ecf5dbfc34d7816f660c8ba8d.zip
Attempt fix of a minor OOBE bug
-rw-r--r--ShiftOS.WinForms/OobeStory.cs36
1 files changed, 25 insertions, 11 deletions
diff --git a/ShiftOS.WinForms/OobeStory.cs b/ShiftOS.WinForms/OobeStory.cs
index b0ecb3c..06f2c08 100644
--- a/ShiftOS.WinForms/OobeStory.cs
+++ b/ShiftOS.WinForms/OobeStory.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
@@ -12,8 +13,22 @@ using ShiftOS.Objects;
namespace ShiftOS.WinForms
{
+ [Namespace("test")]
public class OobeStory
{
+ [Command("test")]
+ [RequiresArgument("num")]
+ public static bool TestThingy(Dictionary<string, object> args)
+ {
+ long num = Convert.ToInt64(args["num"].ToString());
+ string hex = num.ToString("X");
+ string bin = Convert.ToString(num, 2);
+ Console.WriteLine("Hex: " + hex);
+ Console.WriteLine("Bin: " + bin);
+ return true;
+ }
+
+
[Story("mud_fundamentals")]
public static void DoStory()
{
@@ -271,17 +286,16 @@ namespace ShiftOS.WinForms
}
if (!Shiftorium.UpgradeInstalled("desktop"))
{
- term.ClearText();
- TerminalBackend.PrintPrompt();
- Console.Write("sos.status");
- TerminalBackend.InvokeCommand("sos.status");
- TerminalBackend.PrintPrompt();
- Console.Write("sos.help");
- TerminalBackend.InvokeCommand("sos.help");
- }
- else
- {
- AppearanceManager.Close(term);
+ SaveSystem.GameReady += () =>
+ {
+ term.ClearText();
+ TerminalBackend.PrintPrompt();
+ Console.Write("sos.status");
+ TerminalBackend.InvokeCommand("sos.status");
+ TerminalBackend.PrintPrompt();
+ Console.Write("sos.help");
+ TerminalBackend.InvokeCommand("sos.help");
+ };
}
});
}