PIbd-22 Chubykina P.P. LabWork_02 #2

Closed
chubykina_polina wants to merge 4 commits from LabWork_02 into LabWork_01
4 changed files with 2 additions and 7 deletions
Showing only changes of commit 1d208a3dbe - Show all commits

View File

@ -24,8 +24,7 @@ namespace Sailboat.MovementStrategy
{
return null;
}
return new ObjectParameters(_drawingBoat.GetPosX,
_drawingBoat.GetPosY, _drawingBoat.GetWidth, _drawingBoat.GetHeight);
return new ObjectParameters(_drawingBoat.GetPosX, _drawingBoat.GetPosY, _drawingBoat.GetWidth, _drawingBoat.GetHeight);
}
}
public int GetStep => (int)(_drawingBoat?.EntityBoat?.Step ?? 0);

View File

@ -11,8 +11,7 @@ namespace Sailboat.DrawingObjects
{
public class DrawingSailboat : DrawingBoat
{
public DrawingSailboat(int speed, double weight, Color bodyColor, Color
additionalColor, bool hull, bool sail, int width, int height) :
public DrawingSailboat(int speed, double weight, Color bodyColor, Color additionalColor, bool hull, bool sail, int width, int height) :
base(speed, weight, bodyColor, width, height, 160, 160)
{
if (EntityBoat != null)

View File

@ -65,7 +65,6 @@ namespace Sailboat
}
Draw();
}
private void buttonStep_Click(object sender, EventArgs e)
{
if (_drawingBoat == null)
@ -101,6 +100,5 @@ namespace Sailboat
_abstractStrategy = null;
}
}
}
}

View File

@ -50,6 +50,5 @@ namespace Sailboat.MovementStrategy
_width = width;
_height = height;
}
}
}