Unstable 0.17.0.0

Barotrauma/BarotraumaClient/ClientSource/GUI/UISprite.cs

@@ -19,11 +19,7 @@ namespace Barotrauma
             private set;
         }
 
-        public bool Slice
-        {
-            get;
-            set;
-        }
+        public bool Slice => Slices != null;
 
         public Rectangle[] Slices
         {
@@ -54,7 +50,7 @@ namespace Barotrauma
 
         public TransitionMode TransitionMode { get; private set; }
 
-        public UISprite(XElement element)
+        public UISprite(ContentXElement element)
         {
             Sprite = new Sprite(element);
             MaintainAspectRatio = element.GetAttributeBool("maintainaspectratio", false);
@@ -69,6 +65,7 @@ namespace Barotrauma
             }
 
             Vector4 sliceVec = element.GetAttributeVector4("slice", Vector4.Zero);
+            Slices = null;
             if (sliceVec != Vector4.Zero)
             {
                 minBorderScale = element.GetAttributeFloat("minborderscale", 0.1f);
@@ -76,7 +73,6 @@ namespace Barotrauma
 
                 Rectangle slice = new Rectangle((int)sliceVec.X, (int)sliceVec.Y, (int)(sliceVec.Z - sliceVec.X), (int)(sliceVec.W - sliceVec.Y));
 
-                Slice = true;
                 Slices = new Rectangle[9];
 
                 //top-left