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

2019-05-16 06:21:10 +03:00
parent 48070a3f90
commit fcd95da483
14 changed files with 344 additions and 133 deletions
@@ -740,6 +740,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