diff --git a/WarmlyShipProject/WarmlyShipProject/Drawnings/DrawningWarmlyShip2.cs b/WarmlyShipProject/WarmlyShipProject/Drawnings/DrawningWarmlyShip2.cs index 3e63ba2..2089773 100644 --- a/WarmlyShipProject/WarmlyShipProject/Drawnings/DrawningWarmlyShip2.cs +++ b/WarmlyShipProject/WarmlyShipProject/Drawnings/DrawningWarmlyShip2.cs @@ -68,12 +68,6 @@ public class DrawningWarmlyShip2: DrawningWarmlyShip //g.FillRectangle(bodybrush, _startPosX.Value + 100, _startPosY.Value, 30, 20); //g.FillPolygon(bodybrush2, pointsWarmlyShip2); - _startPosX += 10; - _startPosY += 5; - /*base.DrawTransport(g);*/ //ЗАЧЕМ? - _startPosX -= 10; - _startPosY -= 5; - if (teplohod.FirstDack) { Brush bodybrush3 = new SolidBrush(Color.Yellow); diff --git a/WarmlyShipProject/WarmlyShipProject/FormWarmlyShipCollection.cs b/WarmlyShipProject/WarmlyShipProject/FormWarmlyShipCollection.cs index 6d17d3b..d03a0f3 100644 --- a/WarmlyShipProject/WarmlyShipProject/FormWarmlyShipCollection.cs +++ b/WarmlyShipProject/WarmlyShipProject/FormWarmlyShipCollection.cs @@ -68,9 +68,8 @@ public partial class FormWarmlyShipCollection : Form break; case nameof(DrawningWarmlyShip2): // TODO вызов диалогового окна для выбора цвета - drawningWarmlyShip = new DrawningWarmlyShip2(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + drawningWarmlyShip = new DrawningWarmlyShip2(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), + GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; default: