nikskob/PIbd-14_Skobelev_N.N._Base
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Nikita 2025-02-22 23:01:34 +04:00
commit 91bc8d454c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs
View File

@ -30,11 +30,11 @@ public class DrawningBoat
/// </summary> /// </summary>
protected int? _startPosY; protected int? _startPosY;
/// <summary> /// <summary>
/// Ширина прорисовки катамарана /// Ширина прорисовки лодки
/// </summary> /// </summary>
private readonly int _drawningBoatWidth = 60; private readonly int _drawningBoatWidth = 60;
/// <summary> /// <summary>
/// Высота прорисовки катамарана /// Высота прорисовки лодки
/// </summary> /// </summary>
private readonly int _drawningBoatHeight = 22; private readonly int _drawningBoatHeight = 22;
/// <summary> /// <summary>

2
ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs
View File

@ -12,7 +12,7 @@ namespace ProjectCatamaran.MovementStrategy
/// <summary> /// <summary>
/// Поле-объект класса DrawningBoat или его наследника /// Поле-объект класса DrawningBoat или его наследника
/// </summary> /// </summary>
private readonly DrawningBoat _boat = null; private readonly DrawningBoat? _boat = null;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>