d.agliullov/ISEbd-21_Agliullov.D.A._AirBomber.Base
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Добавлена возможность перемещать самолет по карте, и не перемещать в хранилище

Browse Source
This commit is contained in:
Данияр Аглиуллов 2022-10-04 03:00:30 +04:00
parent d58705a5b2
commit 19eeb2b950
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AirBomber/AirBomber/AbstractMap.cs
View File

@ -34,6 +34,8 @@ namespace AirBomber
return DrawMapWithObject(); return DrawMapWithObject();
} }
public bool HasMap => _map != null;
/// <summary>Проверяет наличие непроходимых участков в заданной области</summary> /// <summary>Проверяет наличие непроходимых участков в заданной области</summary>
/// <param name="area">Заданная область</param> /// <param name="area">Заданная область</param>
/// <param name="iBarrier">i-ый индекс первого барьера, который был найден в области</param> /// <param name="iBarrier">i-ый индекс первого барьера, который был найден в области</param>

7
AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs generated
View File

@ -103,6 +103,7 @@
this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 10; this.buttonDown.TabIndex = 10;
this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.UseVisualStyleBackColor = true;
this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
// //
// buttonRight // buttonRight
// //
@ -114,6 +115,7 @@
this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 9; this.buttonRight.TabIndex = 9;
this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.UseVisualStyleBackColor = true;
this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
// //
// buttonLeft // buttonLeft
// //
@ -125,6 +127,7 @@
this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 8; this.buttonLeft.TabIndex = 8;
this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.UseVisualStyleBackColor = true;
this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
// //
// buttonUp // buttonUp
// //
@ -136,6 +139,7 @@
this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 7; this.buttonUp.TabIndex = 7;
this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.UseVisualStyleBackColor = true;
this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
// //
// buttonShowOnMap // buttonShowOnMap
// //
@ -162,7 +166,8 @@
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] { this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта", "Карта со стенами"}); "Простая карта",
"Карта со стенами"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32); this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23); this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);

2
AirBomber/AirBomber/FormMapWithSetAirplanes.cs
View File

@ -125,7 +125,7 @@
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonMove_Click(object sender, EventArgs e) private void ButtonMove_Click(object sender, EventArgs e)
{ {
if (_mapAirplanesCollectionGeneric == null) if (_mapAirplanesCollectionGeneric == null || !_mapAirplanesCollectionGeneric.Map.HasMap)
{ {
return; return;
} }

9
AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs
View File

@ -34,6 +34,9 @@ namespace AirBomber
/// Карта /// Карта
/// </summary> /// </summary>
private readonly U _map; private readonly U _map;
public U Map => _map;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
@ -93,7 +96,7 @@ namespace AirBomber
var airplane = _setAirplanes.Get(i); var airplane = _setAirplanes.Get(i);
if (airplane != null) if (airplane != null)
{ {
return _map.CreateMap(_pictureWidth, _pictureHeight, airplane); return Map.CreateMap(_pictureWidth, _pictureHeight, airplane);
} }
} }
return new(_pictureWidth, _pictureHeight); return new(_pictureWidth, _pictureHeight);
@ -105,9 +108,9 @@ namespace AirBomber
/// <returns></returns> /// <returns></returns>
public Bitmap MoveObject(Direction direction) public Bitmap MoveObject(Direction direction)
{ {
if (_map != null) if (Map != null)
{ {
return _map.MoveObject(direction); return Map.MoveObject(direction);
} }
return new(_pictureWidth, _pictureHeight); return new(_pictureWidth, _pictureHeight);
} }