diff --git a/ProjectPlane/ProjectPlane/DrawningPlane.cs b/ProjectPlane/ProjectPlane/DrawningPlane.cs index df72a1c..11ad743 100644 --- a/ProjectPlane/ProjectPlane/DrawningPlane.cs +++ b/ProjectPlane/ProjectPlane/DrawningPlane.cs @@ -51,9 +51,10 @@ namespace ProjectPlane /// Скорость /// Вес самолета /// Цвет корпуса - public DrawingPlane(int speed, float weight, Color bodyColor) + public void Init(int speed, float weight, Color bodyColor) { - Plane = new EntityPlane(speed, weight, bodyColor); + Plane = new EntityPlane(); + Plane.Init(speed, weight, bodyColor); } /// /// Установка позиции самолета diff --git a/ProjectPlane/ProjectPlane/EntityPlane.cs b/ProjectPlane/ProjectPlane/EntityPlane.cs index 856c101..cab3959 100644 --- a/ProjectPlane/ProjectPlane/EntityPlane.cs +++ b/ProjectPlane/ProjectPlane/EntityPlane.cs @@ -32,7 +32,7 @@ namespace ProjectPlane /// /// /// - public EntityPlane(int speed, float weight, Color bodyColor) + public void Init(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(350, 550) : speed; diff --git a/ProjectPlane/ProjectPlane/FormPlane.cs b/ProjectPlane/ProjectPlane/FormPlane.cs index f76f3c1..ab28350 100644 --- a/ProjectPlane/ProjectPlane/FormPlane.cs +++ b/ProjectPlane/ProjectPlane/FormPlane.cs @@ -48,7 +48,8 @@ private void buttonCreate_Click(object sender, EventArgs e) { Random rand = new Random(); - _plane = new DrawingPlane(rand.Next(200, 500), rand.Next(2000, 3000), + _plane = new DrawingPlane(); + _plane.Init(rand.Next(200, 500), rand.Next(2000, 3000), Color.FromArgb(rand.Next(0, 256), rand.Next(0, 256), rand.Next(0, 256))); _plane.SetPosition(rand.Next(5, 100), rand.Next(40, 100), pictureBoxPlane.Width, pictureBoxPlane.Height);