From 9689bd79b05c5b8c9d14279269ed81a0ff2c8dd0 Mon Sep 17 00:00:00 2001 From: ValAnn Date: Sun, 15 Oct 2023 20:06:58 +0400 Subject: [PATCH] fix --- DumpTruck/DumpTruck/DrawingDumpCar.cs | 14 ++++++-------- ...Form1.Designer.cs => FormDumpTruck.Designer.cs} | 0 DumpTruck/DumpTruck/{Form1.cs => FormDumpTruck.cs} | 0 .../DumpTruck/{Form1.resx => FormDumpTruck.resx} | 0 4 files changed, 6 insertions(+), 8 deletions(-) rename DumpTruck/DumpTruck/{Form1.Designer.cs => FormDumpTruck.Designer.cs} (100%) rename DumpTruck/DumpTruck/{Form1.cs => FormDumpTruck.cs} (100%) rename DumpTruck/DumpTruck/{Form1.resx => FormDumpTruck.resx} (100%) diff --git a/DumpTruck/DumpTruck/DrawingDumpCar.cs b/DumpTruck/DumpTruck/DrawingDumpCar.cs index 8e19495..e425a5e 100644 --- a/DumpTruck/DumpTruck/DrawingDumpCar.cs +++ b/DumpTruck/DumpTruck/DrawingDumpCar.cs @@ -27,16 +27,14 @@ namespace DumpTruck public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height) { + if (width <= _carWidth || height <= _carHeight) + return false; _pictureWidth = width; _pictureHeight = height; - if (_pictureWidth > _carWidth && _pictureHeight > _carHeight) - { - - EntityDumpTruck = new DumpTruck(); - EntityDumpTruck.Init(speed, weight, bodyColor, additionalColor, bodyKit, tent); - return true; - } - return false; + + EntityDumpTruck = new DumpTruck(); + EntityDumpTruck.Init(speed, weight, bodyColor, additionalColor, bodyKit, tent); + return true; } public void SetPosition(int x, int y) diff --git a/DumpTruck/DumpTruck/Form1.Designer.cs b/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs similarity index 100% rename from DumpTruck/DumpTruck/Form1.Designer.cs rename to DumpTruck/DumpTruck/FormDumpTruck.Designer.cs diff --git a/DumpTruck/DumpTruck/Form1.cs b/DumpTruck/DumpTruck/FormDumpTruck.cs similarity index 100% rename from DumpTruck/DumpTruck/Form1.cs rename to DumpTruck/DumpTruck/FormDumpTruck.cs diff --git a/DumpTruck/DumpTruck/Form1.resx b/DumpTruck/DumpTruck/FormDumpTruck.resx similarity index 100% rename from DumpTruck/DumpTruck/Form1.resx rename to DumpTruck/DumpTruck/FormDumpTruck.resx