Convert Cheats to EmuatorServices

This commit is contained in:
adelikat 2014-12-13 22:57:51 +00:00
parent 8eda262ebe
commit 94bd987a73
2 changed files with 6 additions and 11 deletions

View File

@ -757,7 +757,7 @@
this.MinimumSize = new System.Drawing.Size(285, 384);
this.Name = "Cheats";
this.Text = "Cheats";
this.Load += new System.EventHandler(this.NewCheatForm_Load);
this.Load += new System.EventHandler(this.Cheats_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewCheatForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewCheatForm_DragEnter);
this.CheatsContextMenu.ResumeLayout(false);

View File

@ -17,9 +17,11 @@ using BizHawk.Client.EmuHawk.WinFormExtensions;
namespace BizHawk.Client.EmuHawk
{
[RequiredServices(typeof(IMemoryDomains))]
public partial class Cheats : Form, IToolForm
{
public IDictionary<Type, object> EmulatorServices { private get; set; }
private IMemoryDomains Core { get { return (IMemoryDomains)EmulatorServices[typeof(IMemoryDomains)]; } }
public const string NAME = "NamesColumn";
public const string ADDRESS = "AddressColumn";
@ -49,15 +51,11 @@ namespace BizHawk.Client.EmuHawk
private string _sortedColumn = string.Empty;
private bool _sortReverse;
private readonly IMemoryDomains Core;
public bool UpdateBefore { get { return false; } }
public Cheats()
{
Core = (IMemoryDomains)Global.Emulator; // Cast is intentional in order to get a cast excpetion rather than a null reference exception later
InitializeComponent();
CheatEditor.Core = Core;
Closing += (o, e) =>
{
@ -92,11 +90,7 @@ namespace BizHawk.Client.EmuHawk
public void Restart()
{
if (!Global.Emulator.HasMemoryDomains())
{
Close();
}
CheatEditor.Core = Core;
StartNewList();
}
@ -188,8 +182,9 @@ namespace BizHawk.Client.EmuHawk
return file != null && Global.CheatList.SaveFile(file.FullName);
}
private void NewCheatForm_Load(object sender, EventArgs e)
private void Cheats_Load(object sender, EventArgs e)
{
CheatEditor.Core = Core;
LoadConfigSettings();
ToggleGameGenieButton();
CheatEditor.SetAddEvent(AddCheat);