malimova/ISEbd-22_Alimova_M.S._AirBomber_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22 Alimova M.S. Lab Work 03 #3

Closed
malimova wants to merge 12 commits from Lab3 into Lab2
pull from: Lab3
merge into: malimova:Lab2
Conversation 0 Commits 12 Files Changed 12 +4 -6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cadd9bb31 - Show all commits

6
AirBomber/AirBomber/PlanesGenericCollection.cs
View File

@ -21,11 +21,11 @@ namespace AirBomber
/// <summary>
/// Размер занимаемого объектом места (ширина)
/// </summary>
private readonly int _placeSizeWidth = 150;
private readonly int _placeSizeWidth = 170;
/// <summary>
/// Размер занимаемого объектом места (высота)
/// </summary>
private readonly int _placeSizeHeight = 118;
private readonly int _placeSizeHeight = 120;
/// <summary>
/// Набор объектов
/// </summary>
@ -118,9 +118,7 @@ namespace AirBomber
/// <param name="g"></param>
private void DrawObjects(Graphics g)
{
int heightObjCount = _pictureHeight / _placeSizeHeight;
int widthObjCount = _pictureWidth / _placeSizeWidth;
for (int i = 0; i < _collection.Count; i++)
{
T? type = _collection.Get(i);

4
AirBomber/AirBomber/SetGeneric.cs
View File

@ -53,7 +53,7 @@ namespace AirBomber
{
if (_places[i] != null) NoEmpty++;
}
if (NoEmpty == Count - position - 1) return -1;
if (NoEmpty == Count - position) return -1;
if (position < Count && position >= 0)
{
@ -88,7 +88,7 @@ namespace AirBomber
{
return false;
}
_places[position] = null;
_places[position - 1] = null;
return true;
}
/// <summary>