diff --git a/WarmlyLocomotive/DrawningWarmlyLocomotive.cs b/WarmlyLocomotive/DrawningWarmlyLocomotive.cs index adc1c01..b5896ac 100644 --- a/WarmlyLocomotive/DrawningWarmlyLocomotive.cs +++ b/WarmlyLocomotive/DrawningWarmlyLocomotive.cs @@ -35,10 +35,6 @@ public class DrawningWarmlyLocomotive /// /// Инициализация свойств /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool tube, bool fuelTank) @@ -54,9 +50,7 @@ public class DrawningWarmlyLocomotive /// /// Установка границ поля /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) { if (width >= _drawningLocomotiveWidth && height >= _drawningLocomotiveHeight) { @@ -70,8 +64,7 @@ public class DrawningWarmlyLocomotive /// /// Установка позиции /// - /// Координата X - /// Координата Y + public void SetPosition(int x, int y) { if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -81,7 +74,7 @@ public class DrawningWarmlyLocomotive if ((y + _drawningLocomotiveHeight) > _pictureHeight) { - _startPosY = y - _drawningLocomotiveHeight; + _startPosY = _pictureHeight - _drawningLocomotiveHeight; } else { @@ -90,7 +83,7 @@ public class DrawningWarmlyLocomotive if ((x + _drawningLocomotiveWidth) > _pictureWidth) { - _startPosX = x - _drawningLocomotiveWidth; + _startPosX = _pictureWidth - _drawningLocomotiveWidth; } else { @@ -101,12 +94,10 @@ public class DrawningWarmlyLocomotive /// /// Изменение направления перемещения /// - /// Направление - /// true - перемещене выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) { - if (EntityWarmlyLocomotive == null || !_startPosX.HasValue || - !_startPosY.HasValue) + if (EntityWarmlyLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -147,11 +138,10 @@ public class DrawningWarmlyLocomotive /// /// Прорисовка объекта /// - /// + public void DrawTransport(Graphics g) { - if (EntityWarmlyLocomotive == null || !_startPosX.HasValue || - !_startPosY.HasValue) + if (EntityWarmlyLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; }