diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 22f832c..34ae17d 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -36,7 +36,7 @@ public class DrawningBoat /// /// Высота прорисовки катамарана /// - private readonly int _drawningBoatHeight = 25; + private readonly int _drawningBoatHeight = 22; /// /// координата х обьекта /// diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs index ba16109..188f4f3 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs @@ -15,9 +15,9 @@ public class MoveToBorder : AbstractStrategy ObjectParameters? objParams = GetObjectParameters; if (objParams == null) return; - if (objParams.RightBorder + GetStep() < FieldWidth) + if (objParams.RightBorder + GetStep() <= FieldWidth) MoveRight(); - if (objParams.DownBorder + GetStep() < FieldHeight) + if (objParams.DownBorder + GetStep() <= FieldHeight) MoveDown(); } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs index b7b8f69..59c7b89 100644 --- a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs @@ -12,7 +12,7 @@ namespace ProjectCatamaran.MovementStrategy /// /// Поле-объект класса DrawningBoat или его наследника /// - private DrawningBoat _boat = null; + private readonly DrawningBoat _boat = null; /// /// Конструктор ///