(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -801,10 +801,7 @@ namespace Barotrauma.Items.Components
            string msg = TextManager.Get(Msg, true);
            if (msg != null)
            {
-                foreach (InputType inputType in Enum.GetValues(typeof(InputType)))
-                {
-                    msg = msg.Replace("[" + inputType.ToString().ToLowerInvariant() + "]", GameMain.Config.KeyBind(inputType).ToString());
-                }
+                msg = TextManager.ParseInputTypes(msg);
                DisplayMsg = msg;
            }
            else