From 5d59e00c202fc6625c18461dcc992086786cbbaf Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 14 Dec 2014 00:12:44 +0000
Subject: [PATCH] Convert Genesis tools to use EmulatorServices

---
 .../tools/Genesis/GenGameGenie.cs                | 13 ++++++++-----
 .../tools/Genesis/VDPViewer.cs                   | 16 +++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
index b8245bbbba..fe3eb14789 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
@@ -12,8 +12,13 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[RequiredServices(typeof(IEmulator))]
 	public partial class GenGameGenie : Form, IToolForm
 	{
+		public IDictionary<Type, object> EmulatorServices { private get; set; }
+		private IEmulator Emulator { get { return (IEmulator)EmulatorServices[typeof(IEmulator)]; } }
+		private MemoryDomainList MemoryDomains { get { return (EmulatorServices[typeof(IMemoryDomains)] as IMemoryDomains).MemoryDomains; } }
+
 		private readonly Dictionary<char, int> _gameGenieTable = new Dictionary<char, int>
 		{
 			{ 'A', 0 },
@@ -50,8 +55,6 @@ namespace BizHawk.Client.EmuHawk
 			{ '9', 31 }
 		};
 
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
-
 		private bool _processing;
 
 		private void GenGameGenie_Load(object sender, EventArgs e)
@@ -70,7 +73,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			if (Global.Emulator.SystemId != "GEN")
+			if (Emulator.SystemId != "GEN")
 			{
 				Close();
 			}
@@ -78,7 +81,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void UpdateValues()
 		{
-			if (Global.Emulator.SystemId != "GEN")
+			if (Emulator.SystemId != "GEN")
 			{
 				Close();
 			}
@@ -360,7 +363,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var watch = Watch.GenerateWatch(
-				Global.Emulator.AsMemoryDomains().MemoryDomains["MD CART"],
+				MemoryDomains["MD CART"],
 				address,
 				Watch.WatchSize.Word,
 				Watch.DisplayType.Hex,
diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
index 64725ecb99..b37e0e4992 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
@@ -12,20 +12,24 @@ using System.Drawing.Imaging;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[RequiredServices(typeof(GPGX))]
 	public partial class GenVDPViewer : Form, IToolForm
 	{
+		public IDictionary<Type, object> EmulatorServices { private get; set; }
+		private GPGX Emu { get { return (GPGX)EmulatorServices[typeof(GPGX)]; } }
+
 		private LibGPGX.VDPView View = new LibGPGX.VDPView();
-		private GPGX Emu;
 		int palindex = 0;
 
-		public IDictionary<Type, object> EmulatorServices { private get; set; }
+		
 
 		public GenVDPViewer()
 		{
 			InitializeComponent();
 			bmpViewTiles.ChangeBitmapSize(512, 256);
 			bmpViewPal.ChangeBitmapSize(16, 4);
-			Restart();
+
+			TopMost = Global.Config.GenVdpSettings.TopMost;
 		}
 
 		unsafe static void DrawTile(int* dest, int pitch, byte* src, int* pal)
@@ -141,9 +145,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			Emu = Global.Emulator as GPGX;
-			if (Emu == null)
-				Close();
 			UpdateValues();
 		}
 
@@ -259,11 +260,12 @@ namespace BizHawk.Client.EmuHawk
 
 		private void GenVDPViewer_Load(object sender, EventArgs e)
 		{
-			TopMost = Global.Config.GenVdpSettings.TopMost;
 			if (Global.Config.GenVdpSettings.UseWindowPosition)
 			{
 				Location = Global.Config.GenVdpSettings.WindowPosition;
 			}
+
+			Restart();
 		}
 	}
 }