From 634a465c0686dc431ba94f0160faab72ed2706b8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 8 Oct 2013 23:24:56 +0000
Subject: [PATCH] Lua - implement mainmemory.getname()

---
 BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj | 4 +++-
 BizHawk.MultiClient/tools/Lua/LuaImplementation.cs  | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index 745962f2a3..342ff9ff01 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -422,7 +422,9 @@
     <Compile Include="tools\HexEditor\HexFind.Designer.cs">
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\HexEditor\MemoryViewer.cs" />
+    <Compile Include="tools\HexEditor\MemoryViewer.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="tools\Lua\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
index c0cfcd74fb..495ef0f0f8 100644
--- a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
+++ b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
@@ -178,6 +178,7 @@ namespace BizHawk.MultiClient
 
 		public static string[] MainMemoryFunctions = new[]
 		{
+			"getname",
 			"readbyte",
 			"readbyterange",
 			"readfloat",
@@ -2366,6 +2367,11 @@ namespace BizHawk.MultiClient
 
 		#endregion
 
+		public string mainmemory_getname()
+		{
+			return Global.Emulator.MainMemory.Name;
+		}
+
 		public uint mainmemory_readbyte(object lua_addr)
 		{
 			int addr = LuaInt(lua_addr);