(39b4d0859) Merge branch 'dev' into human-ai

2019-05-16 05:08:56 +03:00
parent 616efac2bf
commit 3a3d55d780
13 changed files with 139 additions and 62 deletions
@@ -24,8 +24,6 @@ namespace Barotrauma

        private bool removed;

-        private bool removed;
-
 #if CLIENT
        private List<Decal> burnDecals = new List<Decal>();
 #endif
@@ -337,6 +337,25 @@ namespace Barotrauma
            }
        }

+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
        public override Rectangle Rect
        {
            get