(3e8bdbb0a) v0.8.9.9 + merge fix

2019-04-06 17:52:51 +03:00
parent f043ac26f4
commit d15a88c619
9 changed files with 12 additions and 108 deletions
@@ -486,22 +486,5 @@ namespace Barotrauma.Items.Components

            yield return CoroutineStatus.Success;
        }
-
-        partial void ParseMsg()
-        {
-            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());
-                }
-                DisplayMsg = msg;
-            }
-            else
-            {
-                DisplayMsg = Msg;
-            }
-        }
    }
 }
@@ -345,10 +345,6 @@ namespace Barotrauma.Items.Components
            crosshairPointerSprite?.Draw(spriteBatch, crosshairPointerPos, 0, zoom);
        }

-            crosshairSprite?.Draw(spriteBatch, crosshairPos, readyToFire ? Color.White : Color.White * 0.2f, 0, zoom);
-            crosshairPointerSprite?.Draw(spriteBatch, crosshairPointerPos, 0, zoom);
-        }
-        
        public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
        {
            UInt16 projectileID = msg.ReadUInt16();