(bf212a41f) v0.9.2.0 pre-release test version
This commit is contained in:
@@ -133,17 +133,7 @@ namespace Barotrauma
|
||||
|
||||
if (PlayerInput.KeyHit(Keys.F3))
|
||||
{
|
||||
isOpen = !isOpen;
|
||||
if (isOpen)
|
||||
{
|
||||
textBox.Select();
|
||||
AddToGUIUpdateList();
|
||||
}
|
||||
else
|
||||
{
|
||||
GUI.ForceMouseOn(null);
|
||||
textBox.Deselect();
|
||||
}
|
||||
Toggle();
|
||||
}
|
||||
else if (isOpen && PlayerInput.KeyHit(Keys.Escape))
|
||||
{
|
||||
@@ -179,6 +169,21 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
public static void Toggle()
|
||||
{
|
||||
isOpen = !isOpen;
|
||||
if (isOpen)
|
||||
{
|
||||
textBox.Select();
|
||||
AddToGUIUpdateList();
|
||||
}
|
||||
else
|
||||
{
|
||||
GUI.ForceMouseOn(null);
|
||||
textBox.Deselect();
|
||||
}
|
||||
}
|
||||
|
||||
public static void Draw(SpriteBatch spriteBatch)
|
||||
{
|
||||
if (!isOpen) return;
|
||||
@@ -298,9 +303,16 @@ namespace Barotrauma
|
||||
|
||||
private static void AssignOnClientExecute(string names, Action<string[]> onClientExecute)
|
||||
{
|
||||
Command command = commands.First(c => c.names.Intersect(names.Split('|')).Count() > 0);
|
||||
command.OnClientExecute = onClientExecute;
|
||||
command.RelayToServer = false;
|
||||
Command command = commands.Find(c => c.names.Intersect(names.Split('|')).Count() > 0);
|
||||
if (command == null)
|
||||
{
|
||||
throw new Exception("AssignOnClientExecute failed. Command matching the name(s) \"" + names + "\" not found.");
|
||||
}
|
||||
else
|
||||
{
|
||||
command.OnClientExecute = onClientExecute;
|
||||
command.RelayToServer = false;
|
||||
}
|
||||
}
|
||||
|
||||
private static void AssignRelayToServer(string names, bool relay)
|
||||
@@ -1797,6 +1809,11 @@ namespace Barotrauma
|
||||
limb.HuskSprite.Sprite.ReloadXML();
|
||||
limb.HuskSprite.Sprite.ReloadTexture();
|
||||
}
|
||||
if (limb.HerpesSprite != null)
|
||||
{
|
||||
limb.HerpesSprite.Sprite.ReloadXML();
|
||||
limb.HerpesSprite.Sprite.ReloadTexture();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user