goldfest228/PIBD-21_Lobashov_I_D_SelfPropelledArtilleryUnit_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-21 Лобашов Иван 4 лаб простая #4

Closed
goldfest228 wants to merge 3 commits from lab4 into lab3
pull from: lab4
merge into: goldfest228:lab3
Conversation 0 Commits 3 Files Changed 8 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f5c84eccd - Show all commits

6
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningUsta.cs
View File

@ -68,8 +68,8 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
/// <param name="bodyColor">Основной цвет</param>
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
/// <param name="carWidth">Ширина прорисовки установки</param>
/// <param name="carHeight">Высота прорисовки установки</param>
/// <param name="ustaWidth">Ширина прорисовки установки</param>
/// <param name="ustaHeight">Высота прорисовки установки</param>
protected DrawningUsta(int speed, double weight, Color bodyColor, int
width, int height, int ustaWidth, int ustaHeight)
{
@ -93,7 +93,7 @@ namespace SelfPropelledArtilleryUnit.DrawningObjects
public void SetPosition(int x, int y)
{
// TODO: Изменение x, y, если при установке объект выходит за границы
if (x < 0 || y < 0)
if (x < 0 || y < 0 || x + _ustaWidth > _pictureWidth || y + _ustaHeight > _pictureHeight)
{
x = 10;
y = 10;