DozorovaA.A/PIbd-22_DozorovaAA_ArmoredVehicle_Simple
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
DozorovaA.A 2022-12-01 23:44:18 +04:00
parent 6f2ab026a9
commit ed2545c5d6
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ArmoredVehicle/DrawningObject.cs
View File

@ -70,8 +70,11 @@
{
return false;
}
}else return false;
}else if (machine is TankEnity || otherMachineMachine is TankEnity)
{
return false;
}
return true;
}
}

16
ArmoredVehicle/MachineCompareByColor.cs
View File

@ -34,18 +34,16 @@
{
return 0;
}
if (xCar.GetMachine.ArmoredVehicle.BodyColor.R > yCar.GetMachine.ArmoredVehicle.BodyColor.R)
if (xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R) == 0)
{
if (xCar.GetMachine.ArmoredVehicle.BodyColor.G > yCar.GetMachine.ArmoredVehicle.BodyColor.G)
if (xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R) == 0)
{
if (xCar.GetMachine.ArmoredVehicle.BodyColor.B > yCar.GetMachine.ArmoredVehicle.BodyColor.B)
{
return 1;
}
else return -1;
return xCar.GetMachine.ArmoredVehicle.BodyColor.B.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.B);
}
else return -1;
} else return -1;
else return xCar.GetMachine.ArmoredVehicle.BodyColor.G.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.G);
}
else return xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R);
}
}
}

2
ArmoredVehicle/MachineCompareByType.cs
View File

@ -32,7 +32,7 @@
}
if (xMachine.GetMachine.GetType().Name != yMachine.GetMachine.GetType().Name)
{
if (xMachine.GetMachine.GetType().Name == "DrawningCar")
if (xMachine.GetMachine.GetType().Name == "DrawingArmoredVehicle")
{
return -1;
}