aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ShiftOS_TheReturn/Commands.cs4
-rw-r--r--ShiftOS_TheReturn/TerminalBackend.cs2
2 files changed, 5 insertions, 1 deletions
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 1976ce3..2e70151 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -67,9 +67,11 @@ namespace ShiftOS.Engine
public static bool ShowYesNo(Dictionary<string, object> args)
{
bool forwarding = TerminalBackend.IsForwardingConsoleWrites;
+ var fGuid = TerminalBackend.ForwardGUID;
Action<bool> callback = (result) =>
{
TerminalBackend.IsForwardingConsoleWrites = forwarding;
+ TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
string resultFriendly = (result == true) ? "yes" : "no";
Console.WriteLine($"{SaveSystem.CurrentSave.Username} says {resultFriendly}.");
TerminalBackend.IsForwardingConsoleWrites = false;
@@ -88,9 +90,11 @@ namespace ShiftOS.Engine
public static bool ShowText(Dictionary<string, object> args)
{
bool forwarding = TerminalBackend.IsForwardingConsoleWrites;
+ var fGuid = TerminalBackend.ForwardGUID;
Action<string> callback = (result) =>
{
TerminalBackend.IsForwardingConsoleWrites = forwarding;
+ TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
Console.WriteLine($"{SaveSystem.CurrentSave.Username} says \"{result}\".");
TerminalBackend.IsForwardingConsoleWrites = false;
};
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index 8a8828e..3c8e62a 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -317,7 +317,7 @@ namespace ShiftOS.Engine
}
public static bool IsForwardingConsoleWrites { get; internal set; }
- public static string ForwardGUID { get; private set; }
+ public static string ForwardGUID { get; internal set; }
}
}