(db42ef494) Don't allow combat priority go over 100.

2019-05-16 05:09:51 +03:00
parent 171c42f077
commit 7ebb0be29b
12 changed files with 91 additions and 16 deletions
@@ -24,6 +24,8 @@ namespace Barotrauma

        private bool removed;

+        private bool removed;
+
 #if CLIENT
        private List<Decal> burnDecals = new List<Decal>();
 #endif
@@ -394,6 +394,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