diff --git a/ProjectBoat_bae/ProjectBoat_bae/Entities/EntityMotorBoat.cs b/ProjectBoat_bae/ProjectBoat_bae/Entities/EntityMotorBoat.cs index cef2ddb..94e9f34 100644 --- a/ProjectBoat_bae/ProjectBoat_bae/Entities/EntityMotorBoat.cs +++ b/ProjectBoat_bae/ProjectBoat_bae/Entities/EntityMotorBoat.cs @@ -11,16 +11,12 @@ namespace ProjectBoat_bae.Entities public Color AdditionalColor { get; private set; } public bool Body { get; private set; } public bool Wing { get; private set; } - //public bool SportLine { get; private set; } public EntityMotorBoat(int speed, double weight, Color bodyColor, Color -additionalColor, bool body, bool wing - //, bool sportLine - ) : base(speed, weight, bodyColor) +additionalColor, bool body, bool wing) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; Body = body; Wing = wing; - //SportLine = sportLine; } } } diff --git a/ProjectBoat_bae/ProjectBoat_bae/Form1.Designer.cs b/ProjectBoat_bae/ProjectBoat_bae/Form1.Designer.cs index 2b12df9..b84b208 100644 --- a/ProjectBoat_bae/ProjectBoat_bae/Form1.Designer.cs +++ b/ProjectBoat_bae/ProjectBoat_bae/Form1.Designer.cs @@ -50,7 +50,6 @@ pictureBox1.SizeMode = PictureBoxSizeMode.AutoSize; pictureBox1.TabIndex = 0; pictureBox1.TabStop = false; - pictureBox1.Click += pictureBox1_Click; // // button_bottom // @@ -144,7 +143,6 @@ comboBoxStrategy.Name = "comboBoxStrategy"; comboBoxStrategy.Size = new Size(182, 33); comboBoxStrategy.TabIndex = 9; - comboBoxStrategy.SelectedIndexChanged += comboBoxStrategy_SelectedIndexChanged; // // FormBoat // @@ -162,7 +160,6 @@ Controls.Add(pictureBox1); Name = "FormBoat"; Text = "Form1"; - Load += Form1_Load; ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); ResumeLayout(false); PerformLayout(); diff --git a/ProjectBoat_bae/ProjectBoat_bae/Form1.cs b/ProjectBoat_bae/ProjectBoat_bae/Form1.cs index be4ac16..63deff8 100644 --- a/ProjectBoat_bae/ProjectBoat_bae/Form1.cs +++ b/ProjectBoat_bae/ProjectBoat_bae/Form1.cs @@ -120,22 +120,5 @@ namespace ProjectBoat_bae _abstractStrategy = null; } } - - private void Form1_Load(object sender, EventArgs e) - { - - } - private void pictureBox1_Click(object sender, EventArgs e) - { - - } - private void button_top_Click(object sender, EventArgs e) - { - - } - private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e) - { - - } } } \ No newline at end of file diff --git a/ProjectBoat_bae/ProjectBoat_bae/MovementStrategy/AbstractStrategy.cs b/ProjectBoat_bae/ProjectBoat_bae/MovementStrategy/AbstractStrategy.cs index 5b5a1eb..61e94d5 100644 --- a/ProjectBoat_bae/ProjectBoat_bae/MovementStrategy/AbstractStrategy.cs +++ b/ProjectBoat_bae/ProjectBoat_bae/MovementStrategy/AbstractStrategy.cs @@ -23,7 +23,6 @@ namespace ProjectBoat_bae.MovementStrategy // Статус перемещения public Status GetStatus() { return _state; } - public void SetData(IMoveableObject moveableObject, int width, int height) {