From 5534bbd8b52f591fd4690dc900b2c0042628ac75 Mon Sep 17 00:00:00 2001
From: brandman211 <brandman211@gmail.com>
Date: Sun, 19 Feb 2012 07:08:55 +0000
Subject: [PATCH] -Refactored NES and PCE button orders. -Realized that
 FixMnemonic is useless as GetControllersAsMnemonic() + WriteMovie() = Fixed.
 -Finished the NES / PCE importers, now without string builders (Thanks
 zeromus)! -Converted ImportMMV to this same method.

TODO:
-Decide how's the best way to handle the mnemonic header and implement it. Apparently, anything other than a predefined header and a | is considered as a comment, so I might do something like:

comment Mnemonic format:
[0|UDLRsSBA]
---
 BizHawk.MultiClient/movie/InputAdapters.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index 17d4a16145..0561608bf3 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -164,13 +164,15 @@ namespace BizHawk.MultiClient
 		bool IsBasePressed(string name)
 		{
 			bool ret = Source.IsPressed(name);
+			if (ret)
+			{
+				//int zzz=9;
+			}
 			return ret;
 		}
 
 		public string GetControllersAsMnemonic()
 		{
-			bool hasGlobalEmulator = Global.Emulator != null;
-
 			StringBuilder input = new StringBuilder("|");
 
 			if (ControlType == "Genesis 3-Button Controller")
@@ -220,11 +222,10 @@ namespace BizHawk.MultiClient
 					input.Append(IsBasePressed("P" + player.ToString() + " Left") ? "L" : ".");
 					input.Append(IsBasePressed("P" + player.ToString() + " Right") ? "R" : ".");
 					input.Append(IsBasePressed("P" + player.ToString() + " Select") ? "S" : ".");
-					input.Append(IsBasePressed("P" + player.ToString() + " Run") ? "R" : ".");
+					input.Append(IsBasePressed("P" + player.ToString() + " Run") ? "r" : ".");
 					input.Append(IsBasePressed("P" + player.ToString() + " B2") ? "2" : ".");
 					input.Append(IsBasePressed("P" + player.ToString() + " B1") ? "1" : ".");
 					input.Append("|");
-
 				}
 				return input.ToString();
 			}
@@ -245,10 +246,10 @@ namespace BizHawk.MultiClient
 				return input.ToString();
 			}
 
-			if (ControlType == "NES Controls")
+			if (ControlType == "NES Controller")
 			{
-				input.Append(IsBasePressed("Reset") ? "r" :
-					(hasGlobalEmulator && Global.Emulator.IsLagFrame) ? "L" : ".");
+				input.Append(IsBasePressed("Reset") ? "r" : 
+					Global.Emulator.IsLagFrame ? "L" : ".");
 				input.Append("|");
 				for (int player = 1; player <= 4; player++)
 				{
@@ -545,7 +546,7 @@ namespace BizHawk.MultiClient
 				}
 			}
 
-			if (ControlType == "NES Controls")
+			if (ControlType == "NES Controller")
 			{
 				if (mnemonic.Length < 2) return;
 				Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'L');