From a4d08824edbc0b1464ea9c409315414cce27e48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=82=D1=8F=20=D0=98=D1=85=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0?= Date: Tue, 11 Oct 2022 12:39:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MotorBoat/MotorBoat/AbstractMap.cs | 5 ++--- MotorBoat/MotorBoat/Direction.cs | 2 -- MotorBoat/MotorBoat/DrawningObjectBoat.cs | 1 - MotorBoat/MotorBoat/EntityMotorBoat.cs | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/MotorBoat/MotorBoat/AbstractMap.cs b/MotorBoat/MotorBoat/AbstractMap.cs index 52f6245..413d614 100644 --- a/MotorBoat/MotorBoat/AbstractMap.cs +++ b/MotorBoat/MotorBoat/AbstractMap.cs @@ -17,7 +17,6 @@ namespace MotorBoat protected readonly Random _random = new(); protected readonly int _freeRoad = 0; protected readonly int _barrier = 1; - public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) { _width = width; @@ -158,9 +157,9 @@ namespace MotorBoat if (leftXinS < 0 || bottomYinS > _height || topYinS<0 || rightX > _width) { return false; } - for (int j = topYinS; j < bottomYinS; j++) + for (int j = topYinS; j <= bottomYinS; j++) { - for (int i = leftXinS; i < rightXinS; i++) + for (int i = leftXinS; i <= rightXinS; i++) { if (_map[i, j] == _barrier) { diff --git a/MotorBoat/MotorBoat/Direction.cs b/MotorBoat/MotorBoat/Direction.cs index 29fb18c..9ae1f69 100644 --- a/MotorBoat/MotorBoat/Direction.cs +++ b/MotorBoat/MotorBoat/Direction.cs @@ -13,7 +13,5 @@ namespace MotorBoat Down = 2, Left = 3, Right = 4, - DownLeft=5, - DownRight=6, } } diff --git a/MotorBoat/MotorBoat/DrawningObjectBoat.cs b/MotorBoat/MotorBoat/DrawningObjectBoat.cs index 36c3771..09a0531 100644 --- a/MotorBoat/MotorBoat/DrawningObjectBoat.cs +++ b/MotorBoat/MotorBoat/DrawningObjectBoat.cs @@ -34,7 +34,6 @@ namespace MotorBoat void IDrawningObject.DrawningObject(Graphics g) { - // TODO _boat.DrawTransport(g); } } diff --git a/MotorBoat/MotorBoat/EntityMotorBoat.cs b/MotorBoat/MotorBoat/EntityMotorBoat.cs index 9f6f8c9..e05cd37 100644 --- a/MotorBoat/MotorBoat/EntityMotorBoat.cs +++ b/MotorBoat/MotorBoat/EntityMotorBoat.cs @@ -28,5 +28,4 @@ namespace MotorBoat SportLine = sportLine; } } - }