Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00
parent 118d60342a
commit f42cc78af3
23 changed files with 42 additions and 65 deletions
@@ -54,6 +54,19 @@ namespace Barotrauma
            get { return textBlock.TextColor; }
            set { textBlock.TextColor = value; }
        }
+
+        public override SpriteFont Font
+        {
+            get
+            {
+                return (textBlock==null) ? GUI.Font : textBlock.Font;
+            }
+            set
+            {
+                if (textBlock == null) return;
+                base.Font = value;
+            }
+        }
        
        public string Text
        {