From b19ff398704e01f808450dc2138dc5864bad547a Mon Sep 17 00:00:00 2001 From: "safiulova.k" Date: Mon, 23 Oct 2023 21:05:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=202=20=D1=82=D0=BE?= =?UTF-8?q?=D1=87=D0=BD=D0=BE=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/Catamaran/Catamaran/AbstractStrategy.cs | 1 - base/Catamaran/Catamaran/DrawningCatamaran.cs | 2 -- base/Catamaran/Catamaran/DrawningSailCatamaran.cs | 4 +--- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/base/Catamaran/Catamaran/AbstractStrategy.cs b/base/Catamaran/Catamaran/AbstractStrategy.cs index 02f1d93..baceafd 100644 --- a/base/Catamaran/Catamaran/AbstractStrategy.cs +++ b/base/Catamaran/Catamaran/AbstractStrategy.cs @@ -5,7 +5,6 @@ using System.Text; using System.Threading.Tasks; using Catamaran.MovementStrategy; -//using Catamaran.DrawningObjects; namespace Catamaran.MovementStrategy { diff --git a/base/Catamaran/Catamaran/DrawningCatamaran.cs b/base/Catamaran/Catamaran/DrawningCatamaran.cs index 220e90b..c56fe11 100644 --- a/base/Catamaran/Catamaran/DrawningCatamaran.cs +++ b/base/Catamaran/Catamaran/DrawningCatamaran.cs @@ -80,7 +80,6 @@ namespace Catamaran.DrawningObjects return; } } - /// /// Конструктор /// @@ -91,7 +90,6 @@ namespace Catamaran.DrawningObjects /// Высота картинки /// Ширина прорисовки катамарана /// Высота прорисовки катамарана - /// true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах protected DrawningCatamaran(int speed, double weight, Color bodyColor, int width, int height, int catamaranWidth, int catamaranHeight) { diff --git a/base/Catamaran/Catamaran/DrawningSailCatamaran.cs b/base/Catamaran/Catamaran/DrawningSailCatamaran.cs index 8f5c655..f804fbf 100644 --- a/base/Catamaran/Catamaran/DrawningSailCatamaran.cs +++ b/base/Catamaran/Catamaran/DrawningSailCatamaran.cs @@ -23,7 +23,6 @@ namespace Catamaran.DrawningObjects /// Признак наличия поплавков /// Ширина картинки /// Высота картинки - public DrawningSailCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, bool floatDetail, int width, int height) : base(speed, weight, bodyColor, width, height, 190, 120) @@ -44,7 +43,6 @@ namespace Catamaran.DrawningObjects Brush additionalBrush = new SolidBrush(sailCatamaran.AdditionalColor); - //поплавки if (sailCatamaran.FloatDetail) { @@ -70,6 +68,7 @@ namespace Catamaran.DrawningObjects g.DrawPolygon(pen, floatDetail2); } base.DrawTransport(g); + //парус if (sailCatamaran.Sail) { @@ -78,7 +77,6 @@ namespace Catamaran.DrawningObjects new Point(_startPosX + 30, _startPosY + 80), new Point(_startPosX + 70, _startPosY+10), new Point(_startPosX + 145, _startPosY + 80), - }; g.DrawPolygon(pen, sail); g.FillPolygon(additionalBrush, sail);