(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00
parent 7b6c2f1fa8
commit 3d7a113d75
47 changed files with 651 additions and 461 deletions
@@ -417,6 +417,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
@@ -432,7 +432,7 @@ namespace Barotrauma
                        {
                            //prevent picking up (or deattaching) items
 #if CLIENT
-                            if (GameMain.GameSession.GameMode is TutorialMode)
+                            if (GameMain.GameSession?.GameMode is TutorialMode)
                            {
                                continue;
                            }