Unstable 0.1500.4.0 (Shrek edition)

2021-09-23 21:29:31 +09:00
parent 5a6bbcc79e
commit 3043a9a7bc
124 changed files with 3571 additions and 1848 deletions
@@ -23,6 +23,8 @@ namespace Barotrauma
        private bool selectMultiple;

        public bool Dropped { get; set; }
+        
+        public bool AllowNonText { get; set; }

        public object SelectedItemData
        {
@@ -318,9 +320,9 @@ namespace Barotrauma
                if (textBlock == null)
                {
                    textBlock = component.GetChild<GUITextBlock>();
-                    if (textBlock == null) return false;
+                    if (textBlock is null && !AllowNonText) { return false; }
                }
-                button.Text = textBlock.Text;
+                button.Text = textBlock?.Text ?? "";
            }
            Dropped = false;
            // TODO: OnSelected can be called multiple times and when it shouldn't be called -> turn into an event so that nobody else can call it.