aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Applications/Terminal.cs
diff options
context:
space:
mode:
authorTheRandomMelon <[email protected]>2017-01-08 13:35:24 -0600
committerTheRandomMelon <[email protected]>2017-01-08 13:35:24 -0600
commit16689da57132292db77a84bff9cc4856fa85c199 (patch)
tree052bad98d75ee93681e7606fb40c4ee0ab7f3ea6 /ShiftOS.WinForms/Applications/Terminal.cs
parentbbb83046c83c482b0584519ba79dfbbe0d10f530 (diff)
downloadshiftos_thereturn-16689da57132292db77a84bff9cc4856fa85c199.tar.gz
shiftos_thereturn-16689da57132292db77a84bff9cc4856fa85c199.tar.bz2
shiftos_thereturn-16689da57132292db77a84bff9cc4856fa85c199.zip
Fixed bug where you could type while story is happening
Diffstat (limited to 'ShiftOS.WinForms/Applications/Terminal.cs')
-rw-r--r--ShiftOS.WinForms/Applications/Terminal.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index 9c8fca0..02a1f85 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -239,15 +239,18 @@ namespace ShiftOS.WinForms.Applications {
a.SuppressKeyPress = true;
}
}
- //( ͡° ͜ʖ ͡° ) You found the lennyface without looking at the commit message. Message Michael in the #shiftos channel on Discord saying "ladouceur" somewhere in your message if you see this.
- else if (a.KeyCode == Keys.Up) {
+ //( ͡° ͜ʖ ͡° ) You found the lennyface without looking at the commit message. Message Michael in the #shiftos channel on Discord saying "ladouceur" somewhere in your message if you see this.
+ else if (a.KeyCode == Keys.Up) {
var tostring3 = txt.Lines[txt.Lines.Length - 1];
if (tostring3 == $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
Console.Write(TerminalBackend.LastCommand);
a.SuppressKeyPress = true;
} else {
-
+ if (TerminalBackend.InStory)
+ {
+ a.SuppressKeyPress = true;
+ }
AppearanceManager.CurrentPosition++;
}