From 437e185e68e3c8d9191c5797c3126cc351901b1d Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sat, 19 Mar 2011 20:28:58 +0000
Subject: [PATCH] Ram Watch - saving & load Memory Domain name into .wch file

---
 BizHawk.MultiClient/tools/Cheats.cs   |  1 +
 BizHawk.MultiClient/tools/RamWatch.cs | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index c32cd5d607..741e84b741 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -18,6 +18,7 @@ namespace BizHawk.MultiClient
         //Implement Freeze functions in all memory domains
         //Save - implement (should default to SaveAs if no cheats file)
         //Restore Window Size should restore column order as well
+        //Save & Load Domain name into .wch file
 
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 762381ec7d..13dd86c03d 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -17,7 +17,6 @@ namespace BizHawk.MultiClient
     public partial class RamWatch : Form
     {
         //TODO: 
-        //.wch format includes platform and domain type
         //address num digits based on domain size
         //Restore window size should restore column order as well
         //When receiving a watch from a different domain, should something be done?
@@ -310,7 +309,7 @@ namespace BizHawk.MultiClient
 
             using (StreamWriter sw = new StreamWriter(path))
             {
-                string str = "";
+                string str = "Domain " + Domain.Name + "\n";
                 
                 for (int x = 0; x < watchList.Count; x++)
                 {
@@ -332,6 +331,17 @@ namespace BizHawk.MultiClient
             return true;
         }
 
+        private int GetDomainPos(string name)
+        {
+            //Attempts to find the memory domain by name, if it fails, it defaults to index 0
+            for (int x = 0; x < Global.Emulator.MemoryDomains.Count; x++)
+            {
+                if (Global.Emulator.MemoryDomains[x].Name == name)
+                    return x;
+            }
+            return 0;
+        }
+
         bool LoadWatchFile(string path, bool append)
         {
             int y, z;
@@ -357,6 +367,9 @@ namespace BizHawk.MultiClient
                     //.wch files from other emulators start with a number representing the number of watch, that line can be discarded here
                     //Any properly formatted line couldn't possibly be this short anyway, this also takes care of any garbage lines that might be in a file
                     if (s.Length < 5) continue;
+
+                    if (s.Substring(0, 6) == "Domain")
+                        SetMemoryDomain(GetDomainPos(s.Substring(7, s.Length - 7)));
                     
                     z = HowMany(s, '\t');
                     if (z == 5)