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 04 #4

Closed
malimova wants to merge 7 commits from Lab4 into Lab3
pull from: Lab4
merge into: malimova:Lab3
Conversation 0 Commits 7 Files Changed 6 +13 -11
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 521d4750de - Show all commits

20
AirBomber/AirBomber/PlanesGenericCollection.cs
View File

@ -65,7 +65,7 @@ namespace AirBomber
/// <returns></returns>
public static bool operator -(PlanesGenericCollection<T, U> collect, int pos)
{
T? obj = collect._collection.Get(pos);
T? obj = collect._collection[pos];
if (obj != null)
{
collect._collection.Remove(pos);
@ -80,7 +80,7 @@ namespace AirBomber
/// <returns></returns>
public U? GetU(int pos)
{
return (U?)_collection.Get(pos)?.GetMoveableObject;
return (U?)_collection[pos]?.GetMoveableObject;
}
/// <summary>
/// Вывод всего набора объектов
@ -121,16 +121,18 @@ namespace AirBomber
private void DrawObjects(Graphics g)
{
int widthObjCount = _pictureWidth / _placeSizeWidth;
for (int i = 0; i < _collection.Count; i++)
int i = 0;
foreach (var plane in _collection.GetPlanes())
{
T? type = _collection.Get(i);
if (type != null)
{
int row = i / widthObjCount;
int col = widthObjCount - 1 - (i % widthObjCount);
if (plane != null)
{
int row = i / widthObjCount;
int col = widthObjCount - 1 - (i % widthObjCount);
type.SetPosition(col * _placeSizeWidth, row * _placeSizeHeight);
type?.DrawPlane(g);
plane.SetPosition(col * _placeSizeWidth, row * _placeSizeHeight);
plane?.DrawPlane(g);
}
}
}
}

4
AirBomber/AirBomber/SetGeneric.cs
View File

@ -123,12 +123,12 @@ namespace AirBomber
/// Проход по списку
/// </summary>
/// <returns></returns>
public IEnumerable<T?> GetCars(int? maxCars = null)
public IEnumerable<T?> GetPlanes(int? maxPlanes = null)
{
for (int i = 0; i < _places.Count; ++i)
{
yield return _places[i];
if (maxCars.HasValue && i == maxCars.Value)
if (maxPlanes.HasValue && i == maxPlanes.Value)
{
yield break;
}