Merge branch 'permission-overhaul'. Closes #49
Conflicts: Barotrauma/BarotraumaShared/Source/DebugConsole.cs Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
This commit is contained in:
@@ -15,6 +15,8 @@ namespace Barotrauma
|
||||
|
||||
private static Queue<ColoredText> queuedMessages = new Queue<ColoredText>();
|
||||
|
||||
private static GUITextBlock activeQuestionText;
|
||||
|
||||
public static bool IsOpen
|
||||
{
|
||||
get
|
||||
@@ -69,6 +71,13 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
if (activeQuestionText != null &&
|
||||
(listBox.children.Count == 0 || listBox.children[listBox.children.Count - 1] != activeQuestionText))
|
||||
{
|
||||
listBox.children.Remove(activeQuestionText);
|
||||
listBox.children.Add(activeQuestionText);
|
||||
}
|
||||
|
||||
if (PlayerInput.KeyHit(Keys.F3))
|
||||
{
|
||||
isOpen = !isOpen;
|
||||
@@ -105,7 +114,7 @@ namespace Barotrauma
|
||||
|
||||
if (PlayerInput.KeyHit(Keys.Enter))
|
||||
{
|
||||
ExecuteCommand(textBox.Text, game);
|
||||
ExecuteCommand(textBox.Text);
|
||||
textBox.Text = "";
|
||||
}
|
||||
}
|
||||
@@ -134,7 +143,7 @@ namespace Barotrauma
|
||||
case "entitylist":
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
return client.HasConsoleCommandPermission(command);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,13 +186,6 @@ namespace Barotrauma
|
||||
}
|
||||
|
||||
selectedIndex = Messages.Count;
|
||||
|
||||
if (activeQuestionText != null)
|
||||
{
|
||||
//make sure the active question stays at the bottom of the list
|
||||
listBox.children.Remove(activeQuestionText);
|
||||
listBox.children.Add(activeQuestionText);
|
||||
}
|
||||
}
|
||||
|
||||
private static void InitProjectSpecific()
|
||||
|
||||
Reference in New Issue
Block a user