From c20e24d2ed9d935a4af8238a1ec2e1d6ddc88fa1 Mon Sep 17 00:00:00 2001
From: MorozovDanil <morozov2005danil@mail.ru>
Date: Sun, 31 Mar 2024 23:14:21 +0400
Subject: [PATCH] =?UTF-8?q?=D1=81=D1=80=D0=B0=D0=B7=D1=83=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D1=83=20(=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20=D0=B3=D1=83=D0=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Drawnings/DrawningContainerShip.cs        | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
index 10eb41b..4c9e6b5 100644
--- a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs
@@ -35,6 +35,18 @@ public class DrawningContainerShip : DrawningShip
         base.DrawTransport(g);
         _startPosX -= 5;
         _startPosY -= 30;
+
+        // контейнеры
+        if (containerShip.Container)
+        {
+            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
+            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
+            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
+        }
+
         // кран
         if (containerShip.Crane)
         {
@@ -47,21 +59,6 @@ public class DrawningContainerShip : DrawningShip
 
         }
 
-        
-        //base.DrawTransport(g);
-
-
-        // контейнеры
-        if (containerShip.Container)
-        {
-            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5);
-            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5);
-            g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
-            g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5);
-        }
-        //base.DrawTransport(g);
         _startPosX += 5;
         _startPosY += 30;