Victoria_Presnyakova/Pibd-22_Presnyakova.V.V_Catamaran_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Presnyakova V.V Lab_8 #17

Closed
Victoria_Presnyakova wants to merge 12 commits from Lab_8 into Lab_7
pull from: Lab_8
merge into: Victoria_Presnyakova:Lab_7
Conversation 0 Commits 12 Files Changed 13 +13 -1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 68170b1023 - Show all commits

1
Catamaran/Catamaran.csproj
View File

@ -206,6 +206,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AbstractMap.cs" />
<Compile Include="BoatCompareByColor.cs" />
<Compile Include="BoatCompareByType.cs" />
<Compile Include="BoatNotFoundException.cs" />
<Compile Include="DrawingCatamaran.cs" />

13
Catamaran/DrawingObjectBoat.cs
View File

@ -47,7 +47,18 @@ namespace Catamaran
{
return false;
}
// TODO доделать проверки в случае продвинутого объекта
//доделать проверки в случае продвинутого объекта
var catamaran = boat as EntityCatamaran;
var otherCatamaran = otherBoatBoat as EntityCatamaran;
if (catamaran == null && otherCatamaran == null) return true;
if (catamaran == null || otherCatamaran == null) return false;
if (catamaran.DopColor != otherCatamaran.DopColor) return false;
if (catamaran.Sail != otherCatamaran.Sail) return false;
if (catamaran.Floats != otherCatamaran.Floats) return false;
return true;
}
public void MoveObject(Direction direction)