diff --git a/WarPlanes/WarPlanes.sln b/WarPlanes/AirFighter.sln similarity index 87% rename from WarPlanes/WarPlanes.sln rename to WarPlanes/AirFighter.sln index 48f9a9e..12efab8 100644 --- a/WarPlanes/WarPlanes.sln +++ b/WarPlanes/AirFighter.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32526.322 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WarPlanes", "WarPlanes\WarPlanes.csproj", "{73B34668-A34C-4E60-8961-BFBAF2BCEE88}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AirFighter", "WarPlanes\AirFighter.csproj", "{73B34668-A34C-4E60-8961-BFBAF2BCEE88}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WarPlanes/WarPlanes/AbstractMap.cs b/WarPlanes/WarPlanes/AbstractMap.cs index a9a4765..90f92b0 100644 --- a/WarPlanes/WarPlanes/AbstractMap.cs +++ b/WarPlanes/WarPlanes/AbstractMap.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WarPlanes +namespace AirFighter { internal abstract class AbstractMap { diff --git a/WarPlanes/WarPlanes/WarPlanes.csproj b/WarPlanes/WarPlanes/AirFighter.csproj similarity index 100% rename from WarPlanes/WarPlanes/WarPlanes.csproj rename to WarPlanes/WarPlanes/AirFighter.csproj diff --git a/WarPlanes/WarPlanes/Direction.cs b/WarPlanes/WarPlanes/Direction.cs index b4de59b..b0777d9 100644 --- a/WarPlanes/WarPlanes/Direction.cs +++ b/WarPlanes/WarPlanes/Direction.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Направление перемещения diff --git a/WarPlanes/WarPlanes/DrawningFighter.cs b/WarPlanes/WarPlanes/DrawningFighter.cs index 1aba474..4974d15 100644 --- a/WarPlanes/WarPlanes/DrawningFighter.cs +++ b/WarPlanes/WarPlanes/DrawningFighter.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { internal class DrawningFighter : DrawningWarPlane { diff --git a/WarPlanes/WarPlanes/DrawningObjectWarPlane.cs b/WarPlanes/WarPlanes/DrawningObjectWarPlane.cs index 6af1850..c8e2c7d 100644 --- a/WarPlanes/WarPlanes/DrawningObjectWarPlane.cs +++ b/WarPlanes/WarPlanes/DrawningObjectWarPlane.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { internal class DrawningObjectWarPlane : IDrawningObject { diff --git a/WarPlanes/WarPlanes/DrawningWarPlane.cs b/WarPlanes/WarPlanes/DrawningWarPlane.cs index 5cf40f0..3017cca 100644 --- a/WarPlanes/WarPlanes/DrawningWarPlane.cs +++ b/WarPlanes/WarPlanes/DrawningWarPlane.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности diff --git a/WarPlanes/WarPlanes/EntityFighter.cs b/WarPlanes/WarPlanes/EntityFighter.cs index 3f0b316..c77b46b 100644 --- a/WarPlanes/WarPlanes/EntityFighter.cs +++ b/WarPlanes/WarPlanes/EntityFighter.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Класс-сущность "Истрибитель" diff --git a/WarPlanes/WarPlanes/EntityWarPlane.cs b/WarPlanes/WarPlanes/EntityWarPlane.cs index c882ddb..f9823b0 100644 --- a/WarPlanes/WarPlanes/EntityWarPlane.cs +++ b/WarPlanes/WarPlanes/EntityWarPlane.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Класс-сущность "Военный самолёт" diff --git a/WarPlanes/WarPlanes/FormMap.Designer.cs b/WarPlanes/WarPlanes/FormMap.Designer.cs index 0995a6e..a2c54c1 100644 --- a/WarPlanes/WarPlanes/FormMap.Designer.cs +++ b/WarPlanes/WarPlanes/FormMap.Designer.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { partial class FormMap { @@ -97,7 +97,7 @@ // buttonUp // this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::WarPlanes.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImage = global::AirFighter.Properties.Resources.arrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonUp.Location = new System.Drawing.Point(722, 350); this.buttonUp.Name = "buttonUp"; @@ -109,7 +109,7 @@ // buttonLeft // this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::WarPlanes.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImage = global::AirFighter.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonLeft.Location = new System.Drawing.Point(686, 386); this.buttonLeft.Name = "buttonLeft"; @@ -121,7 +121,7 @@ // buttonRight // this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::WarPlanes.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImage = global::AirFighter.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRight.Location = new System.Drawing.Point(758, 386); this.buttonRight.Name = "buttonRight"; @@ -133,7 +133,7 @@ // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::WarPlanes.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImage = global::AirFighter.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonDown.Location = new System.Drawing.Point(722, 386); this.buttonDown.Name = "buttonDown"; diff --git a/WarPlanes/WarPlanes/FormMap.cs b/WarPlanes/WarPlanes/FormMap.cs index b19dd9a..758f8b6 100644 --- a/WarPlanes/WarPlanes/FormMap.cs +++ b/WarPlanes/WarPlanes/FormMap.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { public partial class FormMap : Form { diff --git a/WarPlanes/WarPlanes/FormWarPlane.Designer.cs b/WarPlanes/WarPlanes/FormWarPlane.Designer.cs index 068fbf7..1d258b2 100644 --- a/WarPlanes/WarPlanes/FormWarPlane.Designer.cs +++ b/WarPlanes/WarPlanes/FormWarPlane.Designer.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { partial class FormWarPlane { @@ -46,7 +46,7 @@ // buttonDown // this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::WarPlanes.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImage = global::AirFighter.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonDown.Location = new System.Drawing.Point(722, 386); this.buttonDown.Name = "buttonDown"; @@ -58,7 +58,7 @@ // buttonRight // this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::WarPlanes.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImage = global::AirFighter.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRight.Location = new System.Drawing.Point(758, 386); this.buttonRight.Name = "buttonRight"; @@ -70,7 +70,7 @@ // buttonLeft // this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::WarPlanes.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImage = global::AirFighter.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonLeft.Location = new System.Drawing.Point(686, 386); this.buttonLeft.Name = "buttonLeft"; @@ -82,7 +82,7 @@ // buttonUp // this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::WarPlanes.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImage = global::AirFighter.Properties.Resources.arrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonUp.Location = new System.Drawing.Point(722, 350); this.buttonUp.Name = "buttonUp"; diff --git a/WarPlanes/WarPlanes/FormWarPlane.cs b/WarPlanes/WarPlanes/FormWarPlane.cs index d1de930..cdfd56f 100644 --- a/WarPlanes/WarPlanes/FormWarPlane.cs +++ b/WarPlanes/WarPlanes/FormWarPlane.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { public partial class FormWarPlane : Form { diff --git a/WarPlanes/WarPlanes/IDrawningObject.cs b/WarPlanes/WarPlanes/IDrawningObject.cs index 8002336..3d6457c 100644 --- a/WarPlanes/WarPlanes/IDrawningObject.cs +++ b/WarPlanes/WarPlanes/IDrawningObject.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { internal interface IDrawningObject { diff --git a/WarPlanes/WarPlanes/Program.cs b/WarPlanes/WarPlanes/Program.cs index 21241cc..b613151 100644 --- a/WarPlanes/WarPlanes/Program.cs +++ b/WarPlanes/WarPlanes/Program.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { internal static class Program { diff --git a/WarPlanes/WarPlanes/Properties/Resources.Designer.cs b/WarPlanes/WarPlanes/Properties/Resources.Designer.cs index bb2583b..657b5a0 100644 --- a/WarPlanes/WarPlanes/Properties/Resources.Designer.cs +++ b/WarPlanes/WarPlanes/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace WarPlanes.Properties { +namespace AirFighter.Properties { using System; @@ -39,7 +39,7 @@ namespace WarPlanes.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WarPlanes.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AirFighter.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/WarPlanes/WarPlanes/SimpleMap.cs b/WarPlanes/WarPlanes/SimpleMap.cs index 1e26bca..7529e0c 100644 --- a/WarPlanes/WarPlanes/SimpleMap.cs +++ b/WarPlanes/WarPlanes/SimpleMap.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Простая реализация абсрактного класса AbstractMap diff --git a/WarPlanes/WarPlanes/СloseMap.cs b/WarPlanes/WarPlanes/СloseMap.cs index fef90cc..83e09b2 100644 --- a/WarPlanes/WarPlanes/СloseMap.cs +++ b/WarPlanes/WarPlanes/СloseMap.cs @@ -1,4 +1,4 @@ -namespace WarPlanes +namespace AirFighter { /// /// Простая реализация абсрактного класса AbstractMap