Pavel_Sorokin/PIbd-21_Sorokin_P.V._Liner._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sorokin_P.V. Lab Work 8 #8

Closed
Pavel_Sorokin wants to merge 9 commits from LabWork08 into LabWork07
pull from: LabWork08
merge into: Pavel_Sorokin:LabWork07
Conversation 0 Commits 9 Files Changed 9 +8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e227e7f26e - Show all commits

8
Liner/Liner/ShipCompareByColor.cs
View File

@ -42,6 +42,14 @@ namespace Liner
{
return xShipColor.CompareTo(yShipColor);
}
if (xShip.GetShip.GetType().Name != yShip.GetShip.GetType().Name)
{
if (xShip.GetShip.GetType().Name == "DrawingShip")
{
return -1;
}
return 1;
}
if (xShip.GetShip.Ship is EntityLiner xLiner && yShip.GetShip.Ship is EntityLiner yLiner)
{
string xShipDopColor = xLiner.DopColor.Name;