From 867060b71679258972e9145adbebdfa091cd4c59 Mon Sep 17 00:00:00 2001 From: Pyro <75787064+pyro-p@users.noreply.github.com> Date: Sun, 18 Feb 2024 20:21:50 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=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=20=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectMotorBoat/DrawingMotorBoat.cs | 10 +++++----- .../ProjectMotorBoat/EntityMotorBoat.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ProjectMotorBoat/ProjectMotorBoat/DrawingMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/DrawingMotorBoat.cs index b379b19..7e04a88 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/DrawingMotorBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/DrawingMotorBoat.cs @@ -9,7 +9,7 @@ namespace ProjectMotorBoat; public class DrawingMotorBoat { /// - /// Класс-сущность + /// Класс-сущность "Катер" /// public EntityMotorBoat? EntityMotorBoat { get; private set; } @@ -52,12 +52,12 @@ public class DrawingMotorBoat /// /// /// - /// + /// /// - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool paddle, bool protectiveGlass) + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool oar, bool protectiveGlass) { EntityMotorBoat = new EntityMotorBoat(); - EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, inboardEngine, paddle, protectiveGlass); + EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, inboardEngine, oar, protectiveGlass); _pictureWidth = null; _pictureHeight = null; _startPosX = null; @@ -245,7 +245,7 @@ public class DrawingMotorBoat } // Вёсла - if (EntityMotorBoat.Paddle) + if (EntityMotorBoat.Oar) { g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 3, 2, 17); g.DrawRectangle(pen, _startPosX.Value + 32, _startPosY.Value + 30, 2, 17); diff --git a/ProjectMotorBoat/ProjectMotorBoat/EntityMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/EntityMotorBoat.cs index 9d238ad..9a9e846 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/EntityMotorBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/EntityMotorBoat.cs @@ -31,12 +31,12 @@ public class EntityMotorBoat public bool InboardEngine { get; private set; } /// - /// Признак (опция) наличия вёсел + /// Признак (опция) наличия весла /// - public bool Paddle { get; private set; } + public bool Oar { get; private set; } /// - /// Возможность глиссирования + /// Признак (опция) наличия защитного стекла /// public bool ProtectiveGlass { get; private set; } @@ -53,16 +53,16 @@ public class EntityMotorBoat /// /// /// - /// - /// - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool paddle, bool protectiveGlass) + /// + /// + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool inboardEngine, bool oar, bool protectiveGlass) { Speed = speed; Weight = weight; BodyColor = bodyColor; AdditionalColor = additionalColor; InboardEngine = inboardEngine; - Paddle = paddle; + Oar = oar; ProtectiveGlass = protectiveGlass; } } \ No newline at end of file