Daniya_Youdakova/PIbd-21_YoudakovaD.R._AircraftCarrier_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Youdakova D.R. PIbd-21 LabWork05 #5

Closed
Daniya_Youdakova wants to merge 5 commits from LabWork05 into LabWork04
pull from: LabWork05
merge into: Daniya_Youdakova:LabWork04
Conversation 0 Commits 5 Files Changed 12 +1 -6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8db0d8b7e - Show all commits

7
AircraftCarrier/AircraftCarrier/AbstractMap.cs
View File

@ -66,7 +66,6 @@ namespace AircraftCarrier
}
}
break;
case Direction.Down:
xNumOfCells = (int)Math.Ceiling((Right - Left) / _size_x);
yNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_y);
@ -93,7 +92,6 @@ namespace AircraftCarrier
}
}
break;
case Direction.Left:
xNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_x);
yNumOfCells = (int)Math.Ceiling((Bottom - Top) / _size_y);
@ -120,13 +118,11 @@ namespace AircraftCarrier
}
}
break;
case Direction.Right:
xNumOfCells = (int)Math.Ceiling(_drawningObject.Step / _size_x);
yNumOfCells = (int)Math.Ceiling((Bottom - Top) / _size_y);
xObjOffset = (int)(Right / _size_x);
yObjOffset = (int)Math.Ceiling(Top / _size_y);
for (int i = 0; i < yNumOfCells; i++)
{
if (!roadIsClear)
@ -148,7 +144,6 @@ namespace AircraftCarrier
}
break;
}
if (roadIsClear)
{
_drawningObject.MoveObject(direction);
@ -186,6 +181,7 @@ namespace AircraftCarrier
y += (int)_size_y;
yObjOffset = (int)(y / _size_y);
}
return false;
}
private bool AreaIsFree(int xNumOfCells, int yNumOfCells, int xObjOffset, int yObjOffset)
@ -206,7 +202,6 @@ namespace AircraftCarrier
}
return true;
}
private Bitmap DrawMapWithObject()
{
Bitmap bmp = new(_width, _height);