diff --git a/AboutDSGM.cs b/AboutDSGM.cs index 0968e8d..c0e69de 100644 --- a/AboutDSGM.cs +++ b/AboutDSGM.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class AboutDSGM diff --git a/Action.cs b/Action.cs index 892854b..642ca44 100644 --- a/Action.cs +++ b/Action.cs @@ -1,10 +1,4 @@ -using Microsoft.VisualBasic; -using System; -using System.Diagnostics.CodeAnalysis; -using System.Drawing; -using System.IO; -using System.Windows.Forms; - + namespace DS_Game_Maker { public partial class Action @@ -140,7 +134,7 @@ private void Action_Load(object sender, EventArgs e) byte DOn = 0; LabelsPanel.Controls.Clear(); ControlsPanel.Controls.Clear(); - foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { string X = X_; if (X.StartsWith("ARG ")) diff --git a/ActionEditor.cs b/ActionEditor.cs index 66bda79..6f19e91 100644 --- a/ActionEditor.cs +++ b/ActionEditor.cs @@ -364,12 +364,12 @@ private void DeleteActionButton_Click(object sender, EventArgs e) string ActionName = ActionsTreeView.SelectedNode.Text; DialogResult Response = MessageBox.Show("Are you sure you want to delete '" + ActionName + "'?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (Response != DialogResult.No) + if (Response == DialogResult.No) { return; } - File.Delete(Constants.AppDirectory + "Actions/" + ActionName + ".action"); + File.Delete(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action"); ActionsTreeView.SelectedNode.Remove(); if (ActionsTreeView.Nodes.Count == 0) { diff --git a/ActionsLib.cs b/ActionsLib.cs index 223cff7..b961f2b 100644 --- a/ActionsLib.cs +++ b/ActionsLib.cs @@ -1,6 +1,4 @@ -using System.Drawing; -using System.IO; - + namespace DS_Game_Maker { static class ActionsLib @@ -9,7 +7,7 @@ static class ActionsLib public static string ActionEquateDisplay(string ActionName, string ActionArguments) { string Returnable = string.Empty; - foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { if (Y.StartsWith("DISPLAY ")) { @@ -19,7 +17,7 @@ public static string ActionEquateDisplay(string ActionName, string ActionArgumen } if (Returnable.Length == 0) return ActionName; - foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { for (int Z = 0, loopTo = (int)DSGMlib.HowManyChar(ActionArguments, ";"); Z <= loopTo; Z++) { diff --git a/Argument.cs b/Argument.cs index fc33675..9f75c34 100644 --- a/Argument.cs +++ b/Argument.cs @@ -1,8 +1,4 @@ -using System; -using System.Linq; -using System.Windows.Forms; -using Microsoft.VisualBasic.CompilerServices; - + namespace DS_Game_Maker { public partial class Argument @@ -24,7 +20,7 @@ private void Argument_Load(object sender, EventArgs e) { for (byte X = 1; X <= 16; X++) TypeDropper.Items.Add(ScriptsLib.ArgumentTypeToString(X)); - TypeDropper.Text = ScriptsLib.ArgumentTypeToString(Conversions.ToByte(ArgumentType)); + TypeDropper.Text = ScriptsLib.ArgumentTypeToString(Convert.ToByte(ArgumentType)); } else { diff --git a/Background.cs b/Background.cs index a8643a1..4b5b785 100644 --- a/Background.cs +++ b/Background.cs @@ -1,10 +1,4 @@ -using System; -using System.IO; -using System.Linq; -using System.Windows.Forms; -using System.Xml.Linq; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { diff --git a/BadSpriteSize.cs b/BadSpriteSize.cs index d1fb537..b437340 100644 --- a/BadSpriteSize.cs +++ b/BadSpriteSize.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class BadSpriteSize diff --git a/Compile.cs b/Compile.cs index 94fceaa..17f9add 100644 --- a/Compile.cs +++ b/Compile.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class Compile diff --git a/Compiled.cs b/Compiled.cs index 75c6554..c9a2851 100644 --- a/Compiled.cs +++ b/Compiled.cs @@ -1,8 +1,4 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Windows.Forms; -using Microsoft.VisualBasic; +using System.Diagnostics; namespace DS_Game_Maker { @@ -53,10 +49,15 @@ private void SavetoKitButton_Click(object sender, EventArgs e) DSGMlib.MsgWarn("There is no USB Reader for a DS Homebrew Kit connected."); return; } + File.Copy(SessionsLib.CompilePath + SessionsLib.CompileName + ".nds", HBKitDrive + DSGMlib.CacheProjectName + ".nds", true); - byte Response = (byte)MessageBox.Show("'" + DSGMlib.CacheProjectName + "' was copied successfully." + Constants.vbCrLf + Constants.vbCrLf + "Safely disconnect USB Reader now?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (!(Response == (int)MsgBoxResult.Yes)) + + DialogResult Response = MessageBox.Show("'" + DSGMlib.CacheProjectName + "' was copied successfully." + Constants.vbCrLf + Constants.vbCrLf + "Safely disconnect USB Reader now?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (Response == DialogResult.No) + { return; + } + DSGMlib.RunBatchString("EjectMedia " + HBKitDrive + Constants.vbCrLf + "RemoveDrive " + HBKitDrive, Constants.AppDirectory, false); } } diff --git a/DEvent.cs b/DEvent.cs index 1ddb7be..8b17dff 100644 --- a/DEvent.cs +++ b/DEvent.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; - + namespace DS_Game_Maker { public partial class DEvent @@ -77,7 +74,9 @@ public void EquateDropper() } } foreach (string X in NewItems) + { Dropper.Items.Add(X); + } } private void EventButtons_Click(object sender, EventArgs e) @@ -105,8 +104,8 @@ private void EventDropper_ItemClicked(object sender, ToolStripItemClickedEventAr private void DEvent_FormClosing(object sender, FormClosingEventArgs e) { - // MainClass = "NoData" - // SubClass = "NoData" + // MainClass = "NoData"; + // SubClass = "NoData"; } private void DCancelButton_Click(object sender, EventArgs e) => DCancelButton_Click(); diff --git a/DObject.cs b/DObject.cs index 0198e06..8cbd3a3 100644 --- a/DObject.cs +++ b/DObject.cs @@ -52,7 +52,7 @@ public void ActionMouseEnter(object sender, EventArgs e) ArgumentsListLabel.Text = string.Empty; byte ArgumentCount = 0; - foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { string X = X_; if (X.StartsWith("ARG ")) @@ -123,7 +123,7 @@ public void ActionMouseUp(object sender, MouseEventArgs e) return; byte ArgCount = 0; bool NoAppliesTo = false; - foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { if (X.StartsWith("ARG ")) ArgCount = (byte)(ArgCount + 1); @@ -264,7 +264,7 @@ public void GenerateIndentIndices() { string ActionName = Actions[X]; byte IndentChange = 0; - foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string Y in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { if (Y == "INDENT") { @@ -329,16 +329,55 @@ public void RenderSprite() { ImagePath = SessionsLib.SessionPath + "Sprites/" + Frame.ToString() + "_" + SpriteDropper.Text + ".png"; } - var Drawable = DSGMlib.PathToImage(ImagePath); - Drawable = DSGMlib.MakeBMPTransparent(Drawable, Color.Magenta); + Image NormalImage = DSGMlib.PathToImage(ImagePath); + Image TransparentImage = DSGMlib.MakeBMPTransparent(NormalImage, Color.Magenta); - int calculateX = (int)Math.Round(32d - Drawable.Width / 2d); - int calculateY = (int)Math.Round(32d - Drawable.Height / 2d); - Point XY = new Point(calculateX, calculateY); + int calculateWidth = -1; + int calculateHeight = -1; - FinalGFX.DrawImage(Drawable, XY); + try + { + calculateWidth = (int)Math.Round(Convert.ToDecimal(32 - NormalImage.Width / 2)); + calculateHeight = (int)Math.Round(Convert.ToDecimal(32d - NormalImage.Height / 2d)); + } + catch + { + if ((calculateWidth == -1) || (calculateWidth <= 16)) + { + calculateWidth = 16; + } + if ((calculateHeight == -1) || (calculateHeight <= 16)) + { + calculateHeight = 16; + } + } + + Point WH = new Point(calculateWidth, calculateHeight); + + bool displayGenerated = false; + + if (TransparentImage != null) + { + try + { + FinalGFX.DrawImage(TransparentImage, WH); + } + catch + { + displayGenerated = true; + } + } + else + { + displayGenerated = true; + } + + if (displayGenerated == true) + { + FinalGFX.DrawImage(DSGMlib.EmptyBitmap(16, 16), WH); + } SpritePanel.BackgroundImage = Final; } @@ -1247,7 +1286,7 @@ public bool ShouldAllowDialog(string ActionName) { bool NoAppliesTo = false; byte ArgCount = 0; - foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + Actions[ActionsList.SelectedIndices[0]] + ".action")) + foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] /*Actions[ActionsList.SelectedIndices[0]]*/ + ".action")) { if (X == "NOAPPLIES") NoAppliesTo = true; diff --git a/DSGMlib.cs b/DSGMlib.cs index f67e171..a5d3843 100644 --- a/DSGMlib.cs +++ b/DSGMlib.cs @@ -1,4 +1,6 @@ -using System.Diagnostics; +using System.ComponentModel.Design; +using System.Diagnostics; +using System.Net.NetworkInformation; namespace DS_Game_Maker { @@ -740,7 +742,7 @@ public static bool CompileGame() bool NeedsAppliesToVar = false; if (!(ActionName == "Execute Code")) { - foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { if (X == "INDENT") IndentOrDedent = 1; @@ -864,7 +866,7 @@ public static bool CompileGame() } else { - foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { string X = X_; @@ -1975,18 +1977,55 @@ public static string PathToString(string path) public static Image PathToImage(string path) { - byte[] imgData = SafeGetFileData(path); + byte[] imgData = SafeGetFileImage(path); return new Bitmap(Image.FromStream(new MemoryStream(imgData))); } + public static byte[] SafeGetFileImage(string filePath) + { + bool supported = false; + + string[] extensions = [".bmp",".gif",".png", ".jpg", ".jpeg"]; + + foreach (string ext in extensions) + { + if (ext == Path.GetExtension(filePath)) + { + supported = true; + } + } + + if(supported == false) + { + return Array.Empty(); + } + + using (FileStream MyFileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read)) + { + using (BinaryReader MyBinaryReader = new BinaryReader(MyFileStream)) + { + byte[] FinalData = MyBinaryReader.ReadBytes((int)MyFileStream.Length); + MyBinaryReader.Close(); + MyFileStream.Close(); + + return FinalData; + } + } + } + public static byte[] SafeGetFileData(string filePath) { - var MyFileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read); - var MyBinaryReader = new BinaryReader(MyFileStream); - byte[] FinalData = MyBinaryReader.ReadBytes((int)MyFileStream.Length); - MyBinaryReader.Close(); - MyFileStream.Close(); - return FinalData; + using (FileStream MyFileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read)) + { + using (BinaryReader MyBinaryReader = new BinaryReader(MyFileStream)) + { + byte[] FinalData = MyBinaryReader.ReadBytes((int)MyFileStream.Length); + MyBinaryReader.Close(); + MyFileStream.Close(); + + return FinalData; + } + } } public static Image MakeBMPTransparent(Image InputImage, Color InputColor) @@ -2224,7 +2263,7 @@ public static void DeleteResource(string ResourceName, string Type) return; } - if (MessageBox.Show("Are you sure you would like to delete '" + ResourceName + "'?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) != DialogResult.OK) + if (MessageBox.Show("Are you sure you would like to delete '" + ResourceName + "'?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) { return; } @@ -2240,26 +2279,33 @@ public static void DeleteResource(string ResourceName, string Type) { foreach (string X in Directory.GetFiles(SessionsLib.CompilePath + "build")) { - if (X.EndsWith("/" + ResourceName + "_Sprite.h") | X.EndsWith("/" + ResourceName + "_Sprite.o")) + if (X.EndsWith("/" + ResourceName + "_Sprite.h") || X.EndsWith("/" + ResourceName + "_Sprite.o")) { File.Delete(X); } } } + if (File.Exists(SessionsLib.CompilePath + "gfx/" + ResourceName + ".png")) { File.Delete(SessionsLib.CompilePath + "gfx/" + ResourceName + ".png"); } + if (File.Exists(SessionsLib.CompilePath + "gfx/bin/" + ResourceName + "_Sprite.bin")) { File.Delete(SessionsLib.CompilePath + "gfx/bin/" + ResourceName + "_Sprite.bin"); } + XDSRemoveLine(GetXDSLine("SPRITE " + ResourceName + ",")); + foreach (string X in Directory.GetFiles(SessionsLib.SessionPath + "Sprites")) { if (X.EndsWith("_" + ResourceName + ".png")) + { File.Delete(X); + } } + var AffectedObjects = new List(); foreach (string X in GetXDSFilter("OBJECT ")) { @@ -2271,6 +2317,7 @@ public static void DeleteResource(string ResourceName, string Type) AffectedObjects.Add(ObjectName); } } + // Update rooms if they contain affected objects >.< foreach (Form X in Program.Forms.main_Form.MdiChildren) { @@ -2286,28 +2333,45 @@ public static void DeleteResource(string ResourceName, string Type) if (AffectedObjects.Contains(DForm.Objects[(int)DOn].ObjectName)) { if (DForm.Objects[(int)DOn].Screen) + { TopAffected = (byte)(TopAffected + 1); + } else + { BottomAffected = (byte)(BottomAffected + 1); - DForm.Objects[(int)DOn].CacheImage = DSGMlib.ObjectGetImage(DForm.Objects[(int)DOn].ObjectName); + } + + DForm.Objects[(int)DOn].CacheImage = ObjectGetImage(DForm.Objects[(int)DOn].ObjectName); } } + if (TopAffected > 0) + { DForm.RefreshRoom(true); + } + if (BottomAffected > 0) + { DForm.RefreshRoom(false); + } } else if (X.Name == "DObject") { DObject DForm = (DObject)X; string SpriteName = DForm.GetSpriteName(); + if (SpriteName == ResourceName) + { DForm.DeleteSprite(); - DForm.MyXDSLines = DSGMlib.UpdateActionsName(DForm.MyXDSLines, "Sprite", ResourceName, "", false); + } + + DForm.MyXDSLines = UpdateActionsName(DForm.MyXDSLines, "Sprite", ResourceName, "", false); UpdateArrayActionsName("Sprite", ResourceName, "", false); } } + CurrentXDS = UpdateActionsName(CurrentXDS, "Object", ResourceName, "", false); + foreach (TreeNode X in Program.Forms.main_Form.ResourcesTreeView.Nodes[(int)ResourceIDs.Sprite].Nodes) { if (X.Text == ResourceName) @@ -2323,10 +2387,13 @@ public static void DeleteResource(string ResourceName, string Type) XDSRemoveFilter("EVENT " + ResourceName + ","); XDSRemoveFilter("ACT " + ResourceName + ","); XDSRemoveFilter("OBJECTPLOT " + ResourceName + ","); + foreach (Form X in Program.Forms.main_Form.MdiChildren) { if (X.Text == ResourceName) + { continue; + } if (X.Name == "Room") { @@ -2335,9 +2402,10 @@ public static void DeleteResource(string ResourceName, string Type) byte TopAffected = 0; byte BottomAffected = 0; DOn = 0; + foreach (Room.AnObject Y in DForm.Objects) { - if (Y.InUse & (Y.ObjectName == ResourceName)) + if (Y.InUse && (Y.ObjectName == ResourceName)) { DForm.Objects[DOn].CacheImage = EmptyBitmap(); DForm.Objects[DOn].InUse = false; @@ -2356,10 +2424,16 @@ public static void DeleteResource(string ResourceName, string Type) } DOn = (short)(DOn + 1); } + if (TopAffected > 0) + { DForm.RefreshRoom(true); + } + if (BottomAffected > 0) + { DForm.RefreshRoom(false); + } } else if (X.Name == "DObject") { @@ -2368,12 +2442,18 @@ public static void DeleteResource(string ResourceName, string Type) foreach (string Y_ in DSGMlib.StringToLines(DForm.MyXDSLines)) { string Y = Y_; + if (Y.Length == 0) + { continue; + } + if (Y.StartsWith("EVENT ")) { if ((iGet(Y, 1, ",") == "6") && (iGet(Y, 2, ",") == ResourceName)) + { Y = iGet(Y, 0, ",") + ",6,"; + } } // If Y.StartsWith("ACT ") And Y.EndsWith("," + ResourceName) Then // Dim Z As String = Y @@ -2386,11 +2466,17 @@ public static void DeleteResource(string ResourceName, string Type) DForm.MyXDSLines = FinalXDS; } } + foreach (TreeNode X in Program.Forms.main_Form.ResourcesTreeView.Nodes[(int)ResourceIDs.DObject].Nodes) { + //X.TreeView.Refresh(); + //Program.Forms.main_Form.ResourcesTreeView.Refresh(); + if (X.Text == ResourceName) { + //Program.Forms.main_Form.ResourcesTreeView.Nodes[1].Nodes.Remove(X); X.Remove(); + //throw new PingException(ResourceName); break; } } @@ -3017,10 +3103,10 @@ public static void URL(string URL) Process.Start(URL); } - public static string GetActionTypes(object ActionName) + public static string GetActionTypes(string ActionName) { string Returnable = string.Empty; - foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName + ".action")) + foreach (string X_ in File.ReadAllLines(Constants.AppDirectory + "Actions/" + ActionName.Split('\\')[1] + ".action")) { string X = X_; if (!X.StartsWith("ARG ")) diff --git a/EditCode.cs b/EditCode.cs index 8845aeb..95e7cb6 100644 --- a/EditCode.cs +++ b/EditCode.cs @@ -1,7 +1,4 @@ -using System; -using System.Windows.Forms; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class EditCode @@ -64,9 +61,13 @@ private void RedoButton_Click(object sender, EventArgs e) private void LoadInButton_Click(object sender, EventArgs e) { - byte MsgResponse = (byte)MessageBox.Show("Importing a Script will erase and replace the current code." + Constants.vbCrLf + Constants.vbCrLf + "Would you like to Continue?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (!(MsgResponse == (int)MsgBoxResult.Yes)) + DialogResult MsgResponse = MessageBox.Show("Importing a Script will erase and replace the current code." + Constants.vbCrLf + Constants.vbCrLf + "Would you like to Continue?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (MsgResponse == DialogResult.No) + { return; + } + + string Response = DSGMlib.OpenFile(string.Empty, "Dynamic Basic Files|*.dbas"); if (Response.Length == 0) return; diff --git a/FontViewer.cs b/FontViewer.cs index 0682ab1..6d2cdec 100644 --- a/FontViewer.cs +++ b/FontViewer.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; -using Microsoft.VisualBasic.CompilerServices; - + namespace DS_Game_Maker { public partial class FontViewer @@ -45,17 +42,17 @@ private void RebuildCacheButton_MouseEnter(object sender, EventArgs e) { switch (((dynamic)sender).Name) { - case var @case when Operators.ConditionalCompareObjectEqual(@case, "RebuildCacheButton", false): + case var @case when !Equals(@case, "RebuildCacheButton"): { MainInfoLabel.Text = "Rebuild Font Cache"; break; } - case var case1 when Operators.ConditionalCompareObjectEqual(case1, "PreviousButton", false): + case var case1 when !Equals(case1, "PreviousButton"): { MainInfoLabel.Text = "Previous Font"; break; } - case var case2 when Operators.ConditionalCompareObjectEqual(case2, "NextButton", false): + case var case2 when !Equals(case2, "NextButton"): { MainInfoLabel.Text = "Next Font"; break; diff --git a/FormAction.Designer.cs b/FormAction.Designer.cs deleted file mode 100644 index f4e20ef..0000000 --- a/FormAction.Designer.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System.Diagnostics; -using System.Drawing; -using System.Windows.Forms; - -namespace DS_Game_Maker -{ - [Microsoft.VisualBasic.CompilerServices.DesignerGenerated()] - public partial class FormAction : Form - { - - // Form overrides dispose to clean up the component list. - [DebuggerNonUserCode()] - protected override void Dispose(bool disposing) - { - try - { - if (disposing && components is not null) - { - components.Dispose(); - } - } - finally - { - base.Dispose(disposing); - } - } - - // Required by the Windows Form Designer - private System.ComponentModel.IContainer components; - - // NOTE: The following procedure is required by the Windows Form Designer - // It can be modified using the Windows Form Designer. - // Do not modify it using the code editor. - [DebuggerStepThrough()] - private void InitializeComponent() - { - var resources = new System.ComponentModel.ComponentResourceManager(typeof(DS_Game_Maker.Action)); - SubPanel = new Panel(); - DOkayButton = new Button(); - AppliesToGroupBox = new GroupBox(); - InstancesTextBox = new TextBox(); - InstancesOfDropper = new ComboBox(); - InstancesRadioButton = new RadioButton(); - InstancesOfRadioButton = new RadioButton(); - ThisRadioButton = new RadioButton(); - LabelsPanel = new Panel(); - ControlsPanel = new Panel(); - SubPanel.SuspendLayout(); - AppliesToGroupBox.SuspendLayout(); - SuspendLayout(); - // - // SubPanel - // - SubPanel.Controls.Add(DOkayButton); - SubPanel.Dock = DockStyle.Bottom; - SubPanel.Location = new Point(0, 272); - SubPanel.Name = "SubPanel"; - SubPanel.Size = new Size(259, 40); - SubPanel.TabIndex = 0; - // - // DOkayButton - // - DOkayButton.ImageAlign = ContentAlignment.MiddleLeft; - DOkayButton.Location = new Point(148, 5); - DOkayButton.Name = "DOkayButton"; - DOkayButton.Size = new Size(104, 26); - DOkayButton.TabIndex = 1; - DOkayButton.Text = "Okay"; - DOkayButton.UseVisualStyleBackColor = true; - // - // AppliesToGroupBox - // - AppliesToGroupBox.Controls.Add(InstancesTextBox); - AppliesToGroupBox.Controls.Add(InstancesOfDropper); - AppliesToGroupBox.Controls.Add(InstancesRadioButton); - AppliesToGroupBox.Controls.Add(InstancesOfRadioButton); - AppliesToGroupBox.Controls.Add(ThisRadioButton); - AppliesToGroupBox.Location = new Point(7, 7); - AppliesToGroupBox.Name = "AppliesToGroupBox"; - AppliesToGroupBox.Size = new Size(245, 90); - AppliesToGroupBox.TabIndex = 1; - AppliesToGroupBox.TabStop = false; - AppliesToGroupBox.Text = "Applies To"; - // - // InstancesTextBox - // - InstancesTextBox.Location = new Point(120, 62); - InstancesTextBox.Name = "InstancesTextBox"; - InstancesTextBox.Size = new Size(119, 21); - InstancesTextBox.TabIndex = 0; - // - // InstancesOfDropper - // - InstancesOfDropper.FormattingEnabled = true; - InstancesOfDropper.Location = new Point(120, 39); - InstancesOfDropper.Name = "InstancesOfDropper"; - InstancesOfDropper.Size = new Size(119, 21); - InstancesOfDropper.TabIndex = 2; - // - // InstancesRadioButton - // - InstancesRadioButton.AutoSize = true; - InstancesRadioButton.Location = new Point(11, 63); - InstancesRadioButton.Name = "InstancesRadioButton"; - InstancesRadioButton.Size = new Size(76, 17); - InstancesRadioButton.TabIndex = 4; - InstancesRadioButton.TabStop = true; - InstancesRadioButton.Text = "Instances:"; - InstancesRadioButton.UseVisualStyleBackColor = true; - // - // InstancesOfRadioButton - // - InstancesOfRadioButton.AutoSize = true; - InstancesOfRadioButton.Location = new Point(11, 40); - InstancesOfRadioButton.Name = "InstancesOfRadioButton"; - InstancesOfRadioButton.Size = new Size(89, 17); - InstancesOfRadioButton.TabIndex = 3; - InstancesOfRadioButton.TabStop = true; - InstancesOfRadioButton.Text = "Instances of:"; - InstancesOfRadioButton.UseVisualStyleBackColor = true; - // - // ThisRadioButton - // - ThisRadioButton.AutoSize = true; - ThisRadioButton.Location = new Point(11, 18); - ThisRadioButton.Name = "ThisRadioButton"; - ThisRadioButton.Size = new Size(44, 17); - ThisRadioButton.TabIndex = 2; - ThisRadioButton.TabStop = true; - ThisRadioButton.Text = "This"; - ThisRadioButton.UseVisualStyleBackColor = true; - // - // LabelsPanel - // - LabelsPanel.Location = new Point(7, 108); - LabelsPanel.Name = "LabelsPanel"; - LabelsPanel.Size = new Size(112, 158); - LabelsPanel.TabIndex = 2; - // - // ControlsPanel - // - ControlsPanel.Location = new Point(122, 108); - ControlsPanel.Name = "ControlsPanel"; - ControlsPanel.Size = new Size(128, 158); - ControlsPanel.TabIndex = 3; - // - // Action - // - AcceptButton = DOkayButton; - AutoScaleDimensions = new SizeF(6.0f, 13.0f); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(259, 312); - Controls.Add(ControlsPanel); - Controls.Add(LabelsPanel); - Controls.Add(AppliesToGroupBox); - Controls.Add(SubPanel); - Font = new Font("Tahoma", 8.25f, FontStyle.Regular, GraphicsUnit.Point, 0); - FormBorderStyle = FormBorderStyle.FixedSingle; - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "Action"; - StartPosition = FormStartPosition.CenterParent; - SubPanel.ResumeLayout(false); - AppliesToGroupBox.ResumeLayout(false); - AppliesToGroupBox.PerformLayout(); - ResumeLayout(false); - - } - internal Panel SubPanel; - internal Button DOkayButton; - internal GroupBox AppliesToGroupBox; - internal RadioButton InstancesRadioButton; - internal RadioButton InstancesOfRadioButton; - internal RadioButton ThisRadioButton; - internal ComboBox InstancesOfDropper; - internal Panel LabelsPanel; - internal Panel ControlsPanel; - internal TextBox InstancesTextBox; - } -} \ No newline at end of file diff --git a/FormAction.cs b/FormAction.cs deleted file mode 100644 index b333e19..0000000 --- a/FormAction.cs +++ /dev/null @@ -1,12 +0,0 @@ - -namespace DS_Game_Maker -{ - public partial class FormAction - { - public FormAction() - { - InitializeComponent(); - } - - } -} \ No newline at end of file diff --git a/FormAction.resx b/FormAction.resx deleted file mode 100644 index 1af7de1..0000000 --- a/FormAction.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/FoundInScripts.cs b/FoundInScripts.cs index 7b98c48..5cd890a 100644 --- a/FoundInScripts.cs +++ b/FoundInScripts.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Windows.Forms; - + namespace DS_Game_Maker { public partial class FoundInScripts diff --git a/GlobalArrays.cs b/GlobalArrays.cs index ec0b987..9b63d6f 100644 --- a/GlobalArrays.cs +++ b/GlobalArrays.cs @@ -1,8 +1,4 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class GlobalArrays diff --git a/GlobalStructures.cs b/GlobalStructures.cs index cdf2f03..eaa7251 100644 --- a/GlobalStructures.cs +++ b/GlobalStructures.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Windows.Forms; -using Microsoft.VisualBasic; +using System.Drawing.Drawing2D; namespace DS_Game_Maker { diff --git a/GlobalVariables.cs b/GlobalVariables.cs index 8c8423d..0f1d51b 100644 --- a/GlobalVariables.cs +++ b/GlobalVariables.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Windows.Forms; -using Microsoft.VisualBasic; -using Microsoft.VisualBasic.CompilerServices; +using System.Drawing.Drawing2D; namespace DS_Game_Maker { @@ -62,7 +56,7 @@ private void RemoveButton_Click(object sender, EventArgs e) short DOn = 0; for (short i = 0, loopTo = (short)(VariablesList.Items.Count - 1); i <= loopTo; i++) { - if (Conversions.ToBoolean(Operators.ConditionalCompareObjectEqual(VariablesList.Items[i], CurrentName, false))) + if (Equals(VariablesList.Items[i], CurrentName)) { DOn = i; break; @@ -257,7 +251,7 @@ private void TypeList_DrawItem(object sender, DrawItemEventArgs e) if ((e.State & DrawItemState.Selected) == DrawItemState.Selected) IsSelected = true; e.Graphics.FillRectangle(Brushes.White, e.Bounds); - string FinalText = Conversions.ToString(TypeList.Items[e.Index]); + string FinalText = TypeList.Items[e.Index].ToString(); if (IsSelected) { var x = new LinearGradientBrush(new Rectangle(0, e.Bounds.X, e.Bounds.Width, e.Bounds.Height), Color.FromArgb(192, 192, 192), Color.FromArgb(80, 80, 80), LinearGradientMode.Vertical); diff --git a/HelpViewer.cs b/HelpViewer.cs index e2edf0d..511d475 100644 --- a/HelpViewer.cs +++ b/HelpViewer.cs @@ -1,7 +1,4 @@ -using System; -using System.Windows.Forms; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class HelpViewer diff --git a/ImportSprite.cs b/ImportSprite.cs index 2fc9417..9f58f26 100644 --- a/ImportSprite.cs +++ b/ImportSprite.cs @@ -1,6 +1,4 @@ -using System; -using System.Drawing; - + namespace DS_Game_Maker { public partial class ImportSprite diff --git a/InputBoxForm.cs b/InputBoxForm.cs index c9972b4..b6615dc 100644 --- a/InputBoxForm.cs +++ b/InputBoxForm.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class InputBoxForm diff --git a/MainForm.cs b/MainForm.cs index 35ff5dd..0f47945 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -2,7 +2,6 @@ namespace DS_Game_Maker { - public partial class MainForm { @@ -898,7 +897,7 @@ private void EditMenu_DropDownOpening(object sender, EventArgs e) private void CompileChangeButton_Click(object sender, EventArgs e) { - switch (((ToolStripMenuItem)sender).Name ?? "") + switch (((ToolStripMenuItem)sender).Name) { case "GraphicsChangeButton": { @@ -927,7 +926,7 @@ private void ResRightClickMenu_Opening(object sender, System.ComponentModel.Canc { try { - ToWorkFrom = ResourcesTreeView.SelectedNode?.Parent; + ToWorkFrom = ResourcesTreeView.SelectedNode.Parent; if (ToWorkFrom == null) { break; // Exit the loop if there is no parent @@ -1018,10 +1017,10 @@ private void ResRightClickMenu_Opening(object sender, System.ComponentModel.Canc } { var withBlock1 = CompilesToNitroFSButton; - if (!(ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) == "Sprite") & !(ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) == "Background")) + if ((ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) != "Sprite") && (ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) != "Background")) { withBlock1.Enabled = false; - if (!(ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) == "Sound")) + if (ToWorkFrom.Text.Substring(0, ToWorkFrom.Text.Length - 1) != "Sound") { withBlock1.Image = Properties.Resources.DeleteIcon; } @@ -1049,7 +1048,6 @@ private void ResRightClickMenu_Opening(object sender, System.ComponentModel.Canc } } } - private void ResourcesTreeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { ResourcesTreeView.SelectedNode = e.Node; @@ -1057,22 +1055,38 @@ private void ResourcesTreeView_NodeMouseClick(object sender, TreeNodeMouseClickE private void DeleteResourceRightClickButton_Click(object sender, EventArgs e) { - string Type = ResourcesTreeView.SelectedNode.Parent.Text.Substring(0, ResourcesTreeView.SelectedNode.Parent.Text.Length - 1); - if (Type == "Object") + string Type = ResourcesTreeView.SelectedNode.Parent.Text; + string TypeObject = Type.Substring(0, ResourcesTreeView.SelectedNode.Parent.Text.Length - 1); + + if (TypeObject == "Object") + { Type = "DObject"; + } + Type = Type.Replace(" ", string.Empty); - DSGMlib.DeleteResource(ResourcesTreeView.SelectedNode.Text, Type); + + string temp = ResourcesTreeView.SelectedNode.Text; + + DSGMlib.DeleteResource(temp, Type); } private void OpenResourceRightClickButton_Click(object sender, EventArgs e) { - DSGMlib.OpenResource(ResourcesTreeView.SelectedNode.Text, (byte)ResourcesTreeView.SelectedNode.Parent.Index, false); + if (ResourcesTreeView.SelectedNode.Parent.Index != null) + { + DSGMlib.OpenResource(ResourcesTreeView.SelectedNode.Text, (byte)ResourcesTreeView.SelectedNode.Parent.Index, false); + } + else + { + throw new NullReferenceException("OpenResource-RightClick-Button *CLICK* was null"); + } } private void AddResourceRightClickButton_Click(object sender, EventArgs e) { + // Take the resource type and strip "Add "(Count 4) from for example Sprite instead of "Add Sprite" string TheText = AddResourceRightClickButton.Text.Substring(4); - switch (TheText ?? "") + switch (TheText) { case "Sprite": { @@ -1109,6 +1123,10 @@ private void AddResourceRightClickButton_Click(object sender, EventArgs e) AddScriptButton_Click(new object(), new EventArgs()); break; } + default: + { + throw new NotSupportedException("Switch did not have a case for desired object: " + TheText + Constants.vbNewLine + "New feature?"); + } } } diff --git a/Options.cs b/Options.cs index 238b521..ceaea78 100644 --- a/Options.cs +++ b/Options.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; -using System.Windows.Forms; - + namespace DS_Game_Maker { public partial class Options diff --git a/OptionsLib.cs b/OptionsLib.cs index 96004d2..e68ccd5 100644 --- a/OptionsLib.cs +++ b/OptionsLib.cs @@ -1,81 +1,81 @@ -using System.Collections.Generic; -using System.IO; -using Microsoft.VisualBasic; // Install-Package Microsoft.VisualBasic - -internal static partial class OptionsLib + +namespace DS_Game_Maker { + internal static partial class OptionsLib + { - public static List OptionNames = new List(); - public static List OptionValues = new List(); - public static string OptionPath = string.Empty; + public static List OptionNames = new List(); + public static List OptionValues = new List(); + public static string OptionPath = string.Empty; - public static void LoadOptions() - { - OptionNames.Clear(); - OptionValues.Clear(); - foreach (string OL in File.ReadAllLines(OptionPath)) + public static void LoadOptions() { - string OName = OL.Substring(0, OL.IndexOf(" ")); - string OValue = OL.Substring(OL.IndexOf(" ") + 1); - OptionNames.Add(OName); - OptionValues.Add(OValue); + OptionNames.Clear(); + OptionValues.Clear(); + foreach (string OL in File.ReadAllLines(OptionPath)) + { + string OName = OL.Substring(0, OL.IndexOf(" ")); + string OValue = OL.Substring(OL.IndexOf(" ") + 1); + OptionNames.Add(OName); + OptionValues.Add(OValue); + } } - } - public static void SaveOptions() - { - string FinalString = string.Empty; - for (ushort I = 0, loopTo = (ushort)(OptionNames.Count - 1); I <= loopTo; I++) - FinalString += OptionNames[I] + " " + OptionValues[I] + Constants.vbCrLf; - File.WriteAllText(OptionPath, FinalString); - } - - public static string GetOption(string SettingName) - { - for (byte SettingNo = 0, loopTo = (byte)(OptionNames.Count - 1); SettingNo <= loopTo; SettingNo++) + public static void SaveOptions() { - if (OptionNames[SettingNo] == SettingName) - return OptionValues[SettingNo]; + string FinalString = string.Empty; + for (ushort I = 0, loopTo = (ushort)(OptionNames.Count - 1); I <= loopTo; I++) + FinalString += OptionNames[I] + " " + OptionValues[I] + Constants.vbCrLf; + File.WriteAllText(OptionPath, FinalString); } - return string.Empty; - } - public static void SetOption(string OptionName, string OptionValue) - { - var BackupValues = new List(); - for (byte SettingNo = 0, loopTo = (byte)(OptionNames.Count - 1); SettingNo <= loopTo; SettingNo++) + public static string GetOption(string SettingName) { - if (OptionNames[SettingNo] == OptionName) + for (byte SettingNo = 0, loopTo = (byte)(OptionNames.Count - 1); SettingNo <= loopTo; SettingNo++) { - BackupValues.Add(OptionValue); - } - else - { - BackupValues.Add(OptionValues[SettingNo]); + if (OptionNames[SettingNo] == SettingName) + return OptionValues[SettingNo]; } + return string.Empty; } - OptionValues.Clear(); - for (ushort I = 0, loopTo1 = (ushort)(BackupValues.Count - 1); I <= loopTo1; I++) - OptionValues.Add(BackupValues[I]); - BackupValues.Clear(); - } - public static void PatchOption(string OName, string OValue) - { - bool DoTheAdd = true; - string FS = string.Empty; - foreach (string OL in File.ReadAllLines(OptionPath)) + public static void SetOption(string OptionName, string OptionValue) { - if (OL.StartsWith(OName + " ")) - DoTheAdd = false; - FS += OL + Constants.vbCrLf; + var BackupValues = new List(); + for (byte SettingNo = 0, loopTo = (byte)(OptionNames.Count - 1); SettingNo <= loopTo; SettingNo++) + { + if (OptionNames[SettingNo] == OptionName) + { + BackupValues.Add(OptionValue); + } + else + { + BackupValues.Add(OptionValues[SettingNo]); + } + } + OptionValues.Clear(); + for (ushort I = 0, loopTo1 = (ushort)(BackupValues.Count - 1); I <= loopTo1; I++) + OptionValues.Add(BackupValues[I]); + BackupValues.Clear(); } - if (DoTheAdd) + + public static void PatchOption(string OName, string OValue) { - FS += OName + " " + OValue; - File.WriteAllText(OptionPath, FS); + bool DoTheAdd = true; + string FS = string.Empty; + foreach (string OL in File.ReadAllLines(OptionPath)) + { + if (OL.StartsWith(OName + " ")) + DoTheAdd = false; + FS += OL + Constants.vbCrLf; + } + if (DoTheAdd) + { + FS += OName + " " + OValue; + File.WriteAllText(OptionPath, FS); + } } - } + } } \ No newline at end of file diff --git a/Preview.cs b/Preview.cs index 45fc4f0..395daa1 100644 --- a/Preview.cs +++ b/Preview.cs @@ -1,6 +1,4 @@ -using System; -using System.Drawing; - + namespace DS_Game_Maker { public partial class Preview diff --git a/ResourcesLib.cs b/ResourcesLib.cs index 36415b9..4e442b6 100644 --- a/ResourcesLib.cs +++ b/ResourcesLib.cs @@ -1,6 +1,4 @@ -using System; -using System.IO; - + namespace DS_Game_Maker { internal static partial class ResourcesLib diff --git a/SessionsLib.cs b/SessionsLib.cs index 456ce65..72007da 100644 --- a/SessionsLib.cs +++ b/SessionsLib.cs @@ -76,7 +76,10 @@ public static void FormSessionFS() File.CreateText(CompilePath + "source/main.c").Dispose(); File.CreateText(CompilePath + "gfx/dsgm_gfx.h").Dispose(); - File.Copy(Constants.AppDirectory + "logo.bmp", CompilePath + "logo.bmp"); + if (File.Exists(CompilePath + "logo.bmp") == false) + { + File.Copy(Constants.AppDirectory + "logo.bmp", CompilePath + "logo.bmp"); + } } } diff --git a/SetCoOrdinates.cs b/SetCoOrdinates.cs index 6277e1d..57c6f62 100644 --- a/SetCoOrdinates.cs +++ b/SetCoOrdinates.cs @@ -1,7 +1,4 @@ -using System; -using System.Windows.Forms; -using Microsoft.VisualBasic.CompilerServices; - + namespace DS_Game_Maker { @@ -18,8 +15,8 @@ public SetCoOrdinates() private void DAcceptButton_Click(object sender, EventArgs e) { - X = Conversions.ToShort(XTextBox.Text.ToString()); - Y = Conversions.ToShort(YTextBox.Text.ToString()); + X = Convert.ToInt16(XTextBox.Text.ToString()); + Y = Convert.ToInt16(YTextBox.Text.ToString()); Close(); } diff --git a/Sound.cs b/Sound.cs index f98c235..8092843 100644 --- a/Sound.cs +++ b/Sound.cs @@ -1,11 +1,5 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; +using System.Diagnostics; using System.Media; -using System.Windows.Forms; -using System.Xml.Linq; -using Microsoft.VisualBasic; namespace DS_Game_Maker { diff --git a/SoundType.cs b/SoundType.cs index c4c58ea..7cf1a5a 100644 --- a/SoundType.cs +++ b/SoundType.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class SoundType diff --git a/Sprite.cs b/Sprite.cs index de04251..d79df92 100644 --- a/Sprite.cs +++ b/Sprite.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Windows.Forms; -using System.Xml.Linq; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class Sprite @@ -356,12 +348,19 @@ private void TransformButton_Click(object sender, EventArgs e) private void FromSheetButton_Click(object sender, EventArgs e) { - byte MSResponse = (byte)MessageBox.Show("Importing from a Sheet will remove all existing frames." + Constants.vbCrLf + Constants.vbCrLf + "Would you like to Continue?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (!(MSResponse == (int)MsgBoxResult.Yes)) + DialogResult MSResponse = MessageBox.Show("Importing from a Sheet will remove all existing frames." + Constants.vbCrLf + Constants.vbCrLf + "Would you like to Continue?", Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (MSResponse == DialogResult.No) + { return; + } + string Response = DSGMlib.OpenFile(string.Empty, DSGMlib.ImageFilter); + if (Response.Length == 0) + { return; + } + string ThePath = SessionsLib.SessionPath + "Sprites/" + SpriteName + "_Import"; Directory.CreateDirectory(ThePath); diff --git a/SpriteSize.cs b/SpriteSize.cs index 97af8e9..4147714 100644 --- a/SpriteSize.cs +++ b/SpriteSize.cs @@ -1,5 +1,4 @@ -using System; - + namespace DS_Game_Maker { public partial class SpriteSize diff --git a/Statistics.cs b/Statistics.cs index 6aca636..fc64f86 100644 --- a/Statistics.cs +++ b/Statistics.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class Statistics diff --git a/StructureItem.cs b/StructureItem.cs index bd997a6..527a586 100644 --- a/StructureItem.cs +++ b/StructureItem.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace DS_Game_Maker { public partial class StructureItem diff --git a/TransformSprite.cs b/TransformSprite.cs index a19270b..202a03f 100644 --- a/TransformSprite.cs +++ b/TransformSprite.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; - + namespace DS_Game_Maker { public partial class TransformSprite diff --git a/Update.cs b/Update.cs index 2b3e801..0fd108d 100644 --- a/Update.cs +++ b/Update.cs @@ -1,7 +1,4 @@ -using System; -using System.Windows.Forms; -using Microsoft.VisualBasic; - + namespace DS_Game_Maker { public partial class DUpdate diff --git a/clsColors.cs b/clsColors.cs index 549cb1d..5355b5f 100644 --- a/clsColors.cs +++ b/clsColors.cs @@ -1,6 +1,4 @@ -using System; -using System.Drawing; - + namespace DS_Game_Maker { static class clsColors diff --git a/clsMenuRenderer.cs b/clsMenuRenderer.cs index 787e914..227f90e 100644 --- a/clsMenuRenderer.cs +++ b/clsMenuRenderer.cs @@ -1,6 +1,4 @@ -using System.Drawing; -using System.Windows.Forms; - + namespace DS_Game_Maker { public class clsMenuRenderer : ToolStripRenderer diff --git a/clsToolStripRenderer.cs b/clsToolStripRenderer.cs index 2ac0833..03d2a6c 100644 --- a/clsToolStripRenderer.cs +++ b/clsToolStripRenderer.cs @@ -1,6 +1,4 @@ -using System.Drawing; -using System.Windows.Forms; - + namespace DS_Game_Maker { public class clsToolstripRenderer : ToolStripProfessionalRenderer