diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs index dfae29f..89f0d00 100644 --- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs +++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs @@ -108,25 +108,30 @@ namespace ArmoredCar /// /// private void ButtonAddarmoredCar_Click(object sender, EventArgs e) + { + var form = new FormArmoredCarConfig(); + form.AddEvent(AddArmoredCar); + form.Show(); + } + + private void AddArmoredCar(DrawningArmoredCar drawningArmoredCar) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormCar form = new(); - if (form.ShowDialog() == DialogResult.OK) + + DrawningObjectArmCar armoredCar = new(drawningArmoredCar); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1) { - DrawningObjectArmCar armoredCar = new(form.SelectedCar); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } /// /// Удаление объекта