TImourka/PIbd-21_Kouvshinoff_T._A._WarmlyLocomotive._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

снова

Browse Source
This commit is contained in:
Timourka 2023-10-23 23:51:58 +04:00
parent a1f0b7d534
commit 986512d2fc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Laba1Loco/Laba1Loco/SetGeneric.cs
View File

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

12
Laba1Loco/Laba1Loco/TrainsGenericCollection.cs
View File

@ -120,15 +120,15 @@ where U : IMoveableObject
private void DrawObjects(Graphics g) private void DrawObjects(Graphics g)
{ {
int i = 0; int i = 0;
foreach (var car in _collection.GetTrains()) foreach (var train in _collection.GetTrains())
{ {
if (car != null) if (train != null)
{ {
car.SetPosition((i % (_pictureWidth / _placeSizeWidth)) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight); train.SetPosition((i % (_pictureWidth / _placeSizeWidth)) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight);
if (car is DrawingLoco) if (train is DrawingLoco)
(car as DrawingLoco).DrawTransport(g); (train as DrawingLoco).DrawTransport(g);
else else
car.DrawTransport(g); train.DrawTransport(g);
} }
i++; i++;
} }