(36f46a8db) Fixed exception CreateAutonomousObjectives causing an exception when attempting to start the game with a sub with no reactor

2019-05-16 06:15:16 +03:00
parent 29fba8b32c
commit c05c8994fb
12 changed files with 168 additions and 292 deletions
@@ -341,6 +341,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