From 2f1f85031640a2c568cbbb1f267adbf83c62ef7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=8F=D1=80=20=D0=90=D0=B3=D0=BB?= =?UTF-8?q?=D0=B8=D1=83=D0=BB=D0=BB=D0=BE=D0=B2?= Date: Tue, 4 Oct 2022 03:00:30 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=81=D0=B0=D0=BC=D0=BE=D0=BB=D0=B5=D1=82?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5,=20=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=20=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=D1=89=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/AirBomber/AbstractMap.cs | 2 ++ AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AirBomber/AirBomber/AbstractMap.cs b/AirBomber/AirBomber/AbstractMap.cs index 8cc655f..62dbec5 100644 --- a/AirBomber/AirBomber/AbstractMap.cs +++ b/AirBomber/AirBomber/AbstractMap.cs @@ -34,6 +34,8 @@ namespace AirBomber return DrawMapWithObject(); } + public bool HasMap => _map != null; + /// Проверяет наличие непроходимых участков в заданной области /// Заданная область /// i-ый индекс первого барьера, который был найден в области diff --git a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs index baef1ea..291cff0 100644 --- a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs +++ b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs @@ -34,6 +34,9 @@ namespace AirBomber /// Карта /// private readonly U _map; + + public U Map => _map; + /// /// Конструктор /// @@ -93,7 +96,7 @@ namespace AirBomber var airplane = _setAirplanes[i]; if (airplane != null) { - return _map.CreateMap(_pictureWidth, _pictureHeight, airplane); + return Map.CreateMap(_pictureWidth, _pictureHeight, airplane); } } return new(_pictureWidth, _pictureHeight); @@ -105,9 +108,9 @@ namespace AirBomber /// public Bitmap MoveObject(Direction direction) { - if (_map != null) + if (Map != null) { - return _map.MoveObject(direction); + return Map.MoveObject(direction); } return new(_pictureWidth, _pictureHeight); }