ekallin/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._BASE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd - 21 Bakalskaya E. D. LabWork06 Base #8

Closed
ekallin wants to merge 8 commits from LabWork06 into LabWork05
pull from: LabWork06
merge into: ekallin:LabWork05
Conversation 1 Commits 8 Files Changed 9 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17a21a8284 - Show all commits

2
ProjectElectricLocomotive/ProjectElectricLocomotive/DrawingElectricLocomotive.cs
View File

@ -14,7 +14,7 @@ namespace ProjectElectricLocomotive.DrawingObjects
{
if (EntityLocomotive != null)
{
EntityLocomotive = new EntityElectricLocomotive(speed, width, bodyColor, additionalColor, horns, seifBatteries);
EntityLocomotive = new EntityElectricLocomotive(speed, weight, bodyColor, additionalColor, horns, seifBatteries);
}
}
public override void DrawTransport(Graphics g)

10
ProjectElectricLocomotive/ProjectElectricLocomotive/ExtentionDrawningCar.cs
View File

@ -69,10 +69,12 @@ namespace ProjectElectricLocomotive
{
return str;
}
return
$"{str}{separatorForObject}{electroLoco.AdditionalColor.Name}{separatorForObject}" +
$"{electroLoco.Horns}{separatorForObject}{electroLoco.SeifBatteries}" /*+
$"{separatorForObject}{electroLoco.SportLine}"*/;
else
{
return
$"{str}{separatorForObject}{electroLoco.AdditionalColor.Name}{separatorForObject}" +
$"{electroLoco.Horns}{separatorForObject}{electroLoco.SeifBatteries}";
}
}
}