From 6e4ffe95d8b307b466117ef7a1267eacca45fdb6 Mon Sep 17 00:00:00 2001 From: YourDax Date: Sun, 15 Oct 2023 22:58:40 +0400 Subject: [PATCH] Fix --- .../AdvancedDrawingAntiAirCraftGun.cs | 4 ++-- .../Enitites/EntityAdvancedAntiAircraftGun.cs | 4 ++-- .../DrawingObjectAntiAirCraftGun.cs | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs b/AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs index 8af7606..8d28d7e 100644 --- a/AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs +++ b/AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs @@ -16,12 +16,12 @@ namespace AntiAircraftGun.DrawingObjects public AdvancedDrawingAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket,bool radar, int width, int height) : base(speed, weight, bodyColor, additionalColor, width, height) { - AntiAirСraftGun = new EntityAdvancedAntiAircraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar); + AntiAirСraftGun = new EntityAdvancedAntiAirCraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar); } public override void DrawTransport(Graphics g) { - if (AntiAirСraftGun is not EntityAdvancedAntiAircraftGun advancedGun) + if (AntiAirСraftGun is not EntityAdvancedAntiAirCraftGun advancedGun) { return; } diff --git a/AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs b/AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs index 2ad1df9..31daa0d 100644 --- a/AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs +++ b/AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AntiAircraftGun.Enitites { - public class EntityAdvancedAntiAircraftGun : EntityAntiAirCraftGun + public class EntityAdvancedAntiAirCraftGun : EntityAntiAirCraftGun { public Color DopColor { get; private set; } @@ -17,7 +17,7 @@ namespace AntiAircraftGun.Enitites - public EntityAdvancedAntiAircraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar) + public EntityAdvancedAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar) : base(speed, weight, bodyColor, additionalColor) { DopColor = dopColor; diff --git a/AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs b/AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs index c3658b5..6a4948c 100644 --- a/AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs +++ b/AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs @@ -9,28 +9,28 @@ namespace AntiAircraftGun.MovementStrategy { public class DrawingObjectAntiAirCraftGun : IMoveableObject { - private readonly BaseDrawingAntiAirCraftGun? _drawningCar = null; + private readonly BaseDrawingAntiAirCraftGun? _drawningAntiAirCraftGun = null; public DrawingObjectAntiAirCraftGun(BaseDrawingAntiAirCraftGun drawningCar) { - _drawningCar = drawningCar; + _drawningAntiAirCraftGun = drawningCar; } public ObjectParameters? GetObjectPosition { get { - if (_drawningCar == null || _drawningCar.AntiAirСraftGun == + if (_drawningAntiAirCraftGun == null || _drawningAntiAirCraftGun.AntiAirСraftGun == null) { return null; } - return new ObjectParameters(_drawningCar.GetPosX, - _drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight); + return new ObjectParameters(_drawningAntiAirCraftGun.GetPosX, + _drawningAntiAirCraftGun.GetPosY, _drawningAntiAirCraftGun.GetWidth, _drawningAntiAirCraftGun.GetHeight); } } - public int GetStep => (int)(_drawningCar?.AntiAirСraftGun?.Step ?? 0); + public int GetStep => (int)(_drawningAntiAirCraftGun?.AntiAirСraftGun?.Step ?? 0); public bool CheckCanMove(DirectionType direction) => - _drawningCar?.CanMove(direction) ?? false; + _drawningAntiAirCraftGun?.CanMove(direction) ?? false; public void MoveObject(DirectionType direction) => - _drawningCar?.MoveTransport(direction); + _drawningAntiAirCraftGun?.MoveTransport(direction); } }