From 614a721e048f9d1e81e39cc04b4831e9e3bee34e Mon Sep 17 00:00:00 2001 From: Hells Hound Date: Wed, 21 Sep 2022 09:04:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AircraftCarrier/DrawingWarship.cs | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/AircraftCarrier/AircraftCarrier/DrawingWarship.cs b/AircraftCarrier/AircraftCarrier/DrawingWarship.cs index e5fdddb..d1ba1a3 100644 --- a/AircraftCarrier/AircraftCarrier/DrawingWarship.cs +++ b/AircraftCarrier/AircraftCarrier/DrawingWarship.cs @@ -59,27 +59,14 @@ namespace AircraftCarrier /// public void SetPosition(int x, int y, int width, int height) { - _startPosX = x; - _startPosY = y; - _pictureWidth = width; - _pictureHeight = height; - - if (width < _warshipWidth) + if (width >= x + _warshipWidth && height >= y + _warshipHeight && x >= 0 && y >= 0) { - width = _warshipWidth; - } - if (height < _warshipHeight) - { - height = _warshipHeight; - } - if(x + _warshipWidth > width) - { - _startPosX -= x + _warshipWidth - width; - } - if (y + _warshipHeight > height) - { - _pictureHeight -= y + _warshipHeight - height; + _startPosX = x; + _startPosY = y; + _pictureWidth = width; + _pictureHeight = height; } + else return; } /// /// Изменение направления пермещения