Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
552b55aeca | |||
8721d19621 | |||
9671af356a | |||
6eb7548f3e | |||
614a721e04 |
@ -59,27 +59,13 @@ namespace AircraftCarrier
|
||||
/// <param name="height"></param>
|
||||
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;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Изменение направления пермещения
|
||||
|
@ -40,7 +40,5 @@ namespace AircraftCarrier
|
||||
Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
|
||||
BodyColor = bodyColor;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ namespace AircraftCarrier
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
private void ButtonCreate_Click(object sender, EventArgs e)
|
||||
{
|
||||
{
|
||||
Random rnd = new();
|
||||
_warship = new DrawingWarship();
|
||||
_warship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
|
||||
|
Loading…
Reference in New Issue
Block a user