From a05c70a7e30bd31f0f07ed5a89be3f432d9b2d13 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Sat, 6 Apr 2024 12:34:08 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=20=D0=B4=D0=B2=D0=B0?= =?UTF-8?q?=20=D0=B1=D0=B5=D0=B7=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawningDozer.cs | 2 -- .../Entities/EntityBulldozer.cs | 24 ++----------------- .../ProjectBulldozer/FormBulldozer.cs | 4 +--- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs index 5d45b56..919627d 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs @@ -99,9 +99,7 @@ public class DrawningDozer protected DrawningDozer (int drawningBulldozerWidth, int drawningBulldozerHeigh) :this() { _drawningBulldozerWidth = drawningBulldozerWidth; - //???????? _pictureHeight = drawningBulldozerHeigh; - //???????? } /// diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs index db024f8..cac384c 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs @@ -10,8 +10,7 @@ namespace ProjectBulldozer.Entities; /// Класс-сущность "Бульдозер" /// public class EntityBulldozer : EntityDozer -{ - +{ /// /// Признак (опция) наличие отвала(ковша) @@ -22,26 +21,7 @@ public class EntityBulldozer : EntityDozer /// Признак (опция) наличие гусеницы /// public bool Caterpillar { get; private set; } -/* - /// - /// Шаг перемещения бульдозера - /// - public double Step => Speed * 100 / Weight;*/ -/* - /// - ///Инициализация полей объекта-класса бульдозера - /// - ///Скорость - ///Вес - ///Основной цвет - ///Дополнительный цвет - ///Признак наличия отвала - ///Признак наличия гусеницы - public void EntityBulldozer(bool blade, bool caterpillar) base(speed, ) - { - Blade = blade; - Caterpillar = caterpillar; - }*/ + public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, bool blade, bool caterpillar) : base(speed, weight, bodyColor, additionalColor) { Blade = blade; diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs index 2b776ba..6b657fe 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs @@ -177,6 +177,4 @@ public partial class FormBulldozer : Form _strategy = null; } } -} - -//2 +} \ No newline at end of file