diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs index 1dce398755..33514eaaad 100644 --- a/BizHawk.MultiClient/tools/Cheats.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs @@ -432,10 +432,11 @@ // this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(13, 305); + this.MessageLabel.Location = new System.Drawing.Point(13, 312); this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(0, 13); + this.MessageLabel.Size = new System.Drawing.Size(31, 13); this.MessageLabel.TabIndex = 3; + this.MessageLabel.Text = " "; // // AddCheatGroup // diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index eee0172cc4..56fe4a57c7 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -14,12 +14,9 @@ namespace BizHawk.MultiClient public partial class Cheats : Form { //Open/Close rom should start a new cheat list - //File format - loading //Implement Options menu settings //Implement Freeze/Unfreeze on enabled changed in Cheat object //Save - implement (should default to SaveAs if no cheats file) - //Append file - int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; @@ -818,7 +815,11 @@ namespace BizHawk.MultiClient private void appendFileToolStripMenuItem_Click(object sender, EventArgs e) { - + var file = GetFileFromUser(); + if (file != null) + LoadCheatFile(file.FullName, true); + DisplayCheatsList(); + Changes(); } } }