From cf00e1bcc28a315d453c962174409ae3c5362e79 Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Fri, 24 Nov 2023 08:53:01 +0300 Subject: [PATCH] =?UTF-8?q?6=20=D0=BB=D0=B0=D0=B1=D0=B0=20-=20=D0=92=20?= =?UTF-8?q?=D0=A1=20=D0=81=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExtentionDrawningAirplane.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ExtentionDrawningAirplane.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ExtentionDrawningAirplane.cs index b1ccb88..1b014fc 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ExtentionDrawningAirplane.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/ExtentionDrawningAirplane.cs @@ -15,8 +15,7 @@ namespace ProjectAirplaneWithRadar string[] strs = info.Split(separatorForObject); if (strs.Length == 3) { - return new DrawningAirplane(Convert.ToInt32(strs[0]), - Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height); + return new DrawningAirplane(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height); } if (strs.Length == 6) { @@ -25,21 +24,19 @@ namespace ProjectAirplaneWithRadar Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), - Convert.ToBoolean(strs[6]), width, height); + Convert.ToBoolean(strs[5]), width, height); } return null; } - public static string GetDataForSave(this DrawningAirplane drawningAirplane, - char separatorForObject) + public static string GetDataForSave(this DrawningAirplane drawningAirplane,char separatorForObject) { - var car = drawningAirplane.EntityAirplane; - if (car == null) + var airplane = drawningAirplane.EntityAirplane; + if (airplane == null) { return string.Empty; } - var str = - $"{car.Speed}{separatorForObject}{car.Weight}{separatorForObject}{car.BodyColor.Name}"; - if (car is not EntityAirplaneWithRadar airplaneWithRadar) + var str = $"{airplane.Speed}{separatorForObject}{airplane.Weight}{separatorForObject}{airplane.BodyColor.Name}"; + if (airplane is not EntityAirplaneWithRadar airplaneWithRadar) { return str; }