(935f68e00) Fix characters waiting when they shouldn't after being left uncontrolled by the player.

2019-05-16 06:57:50 +03:00
parent b97ecddf03
commit 3fc539d373
11 changed files with 137 additions and 695 deletions
@@ -83,7 +83,24 @@ namespace Barotrauma

        public readonly List<Gap> ConnectedGaps = new List<Gap>();

-        public readonly List<Gap> ConnectedGaps = new List<Gap>();
+        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 string DisplayName
+        {
+            get;
+            private set;
+        }

        private string roomName;
        [Editable, Serialize("", true, translationTextTag: "RoomName.")]