(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-04 11:09:45 +03:00
parent 1966bcb4ab
commit 41da4e24a9
17 changed files with 590 additions and 71 deletions
@@ -38,6 +38,9 @@ namespace Barotrauma

            SerializableProperty.DeserializeProperties(this, configElement);

+            name = TextManager.Get("EntityName." + identifier, returnNull: true) ?? name;
+            Description = TextManager.Get("EntityDescription." + identifier, returnNull: true) ?? Description;
+
            int minX = int.MaxValue, minY = int.MaxValue;
            int maxX = int.MinValue, maxY = int.MinValue;
            DisplayEntities = new List<Pair<MapEntityPrefab, Rectangle>>();