YourDax/PIbd-23_Tikhonenkov_A.E_AntiAircraftGun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправил с учетом прошлых изменений

Browse Source
This commit is contained in:
Алексей Тихоненков 2023-10-30 16:39:27 +04:00
commit 7b693f5fd7
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
AntiAirCraftGun/AntiAirCraftGun/Generics/AntiAirCraftGunGenericCollection.cs
View File

@ -51,31 +51,26 @@ namespace AntiAircraftGun.Generics
/// <param name="collect"></param>
/// <param name="obj"></param>
/// <returns></returns>
public static bool operator +(AntiAirCraftGunGenericCollection<T, U> collect, T? obj)
public static int operator +(AntiAirCraftGunGenericCollection<T,U> collect, T? obj)
{
if (obj == null)
{
MessageBox.Show("Объект пустой. Невозможно добавить.");
return false;
}
return collect?._collection.Insert(obj) ?? false;
return -1;
return collect?._collection.Insert(obj) ?? -1;
}
/// <summary>
/// Перегрузка оператора вычитания
/// </summary>
/// <param name="collect"></param>
/// <param name="pos"></param>
/// <returns></returns>
public static T? operator -(AntiAirCraftGunGenericCollection<T, U> collect, int pos)
public static bool operator -(AntiAirCraftGunGenericCollection<T, U> collect, int pos)
{
T? obj = collect._collection[pos];
if (obj != null)
{
collect._collection.Remove(pos);
}
return obj;
T? obj = collect._collection.Get(pos);
if (obj != null)
return collect._collection.Remove(pos);
return false;
}
/// <summary>
/// Получение объекта IMoveableObject
/// </summary>
@ -156,9 +151,21 @@ namespace AntiAircraftGun.Generics
if (y + distance_between_objects >= maxY)
{
y = 0;
x += obj.GetWidth + 10 + _placeSizeWidth;
x += _placeSizeWidth;
}
}
if (obj == null)
{
// Увеличиваем координату Y для следующего объекта
y += distance_between_objects;
// Проверяем, если Y достигло максимума, изменяем X и сбрасываем Y
if (y+distance_between_objects >= maxY)
{
y = 0;
x += _placeSizeWidth;
}
};
}
}
}

2
AntiAirCraftGun/AntiAirCraftGun/Generics/SetGeneric.cs
View File

@ -35,7 +35,7 @@ namespace AntiAircraftGun.Generics
/// </summary>
/// <param name="car">Добавляемый автомобиль</param>
/// <returns></returns>
public bool Insert(T car)
public int Insert(T car)
{
if (_places.Count == _maxCount)
return false;