(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

Barotrauma/BarotraumaShared/Source/Sprite/DeformableSprite.cs

@@ -5,30 +5,25 @@ namespace Barotrauma
 {
     partial class DeformableSprite
     {
-        private Sprite sprite;
-
         public Vector2 Size
         {
-            get { return sprite.size; }
+            get { return Sprite.size; }
         }
 
         public Vector2 Origin
         {
-            get { return sprite.Origin; }
-            set { sprite.Origin = value; }
+            get { return Sprite.Origin; }
+            set { Sprite.Origin = value; }
         }
 
-        public Sprite Sprite
+        public Sprite Sprite { get; private set; }
+
+        public DeformableSprite(XElement element, int? subdivisionsX = null, int? subdivisionsY = null, string filePath = "", bool lazyLoad = false)
         {
-            get { return sprite; }
+            Sprite = new Sprite(element, file: filePath, lazyLoad: lazyLoad);
+            InitProjSpecific(element, subdivisionsX, subdivisionsY, lazyLoad);
         }
 
-        public DeformableSprite(XElement element, int? subdivisionsX = null, int? subdivisionsY = null, string filePath = "")
-        {
-            sprite = new Sprite(element, file: filePath);
-            InitProjSpecific(element, subdivisionsX, subdivisionsY);
-        }
-
-        partial void InitProjSpecific(XElement element, int? subdivisionsX, int? subdivisionsY);
+        partial void InitProjSpecific(XElement element, int? subdivisionsX, int? subdivisionsY, bool lazyLoad = false);
     }
 }