From d3b6364db030a5e003b146298f928ddbc0264bfb Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sat, 26 Nov 2016 17:41:00 +0300
Subject: [PATCH] bk2 log generator: - pick actually neutral analog values for
 empty entry - properly hide all neutral values from input display

---
 .../inputAdapters/InputAdapters.cs            |  6 ++-
 .../movie/bk2/Bk2LogEntryGenerator.cs         | 39 +++++++++----------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/BizHawk.Client.Common/inputAdapters/InputAdapters.cs b/BizHawk.Client.Common/inputAdapters/InputAdapters.cs
index 4042aaa89d..8e1aa27112 100644
--- a/BizHawk.Client.Common/inputAdapters/InputAdapters.cs
+++ b/BizHawk.Client.Common/inputAdapters/InputAdapters.cs
@@ -245,7 +245,11 @@ namespace BizHawk.Client.Common
 
 		// pass floats solely from the original source
 		// this works in the code because SourceOr is the autofire controller
-		public float GetFloat(string name) { return 0.0F; } // Floats don't make sense in sticky land
+		public float GetFloat(string name)
+		{
+			int i = Source.Type.FloatControls.IndexOf(name);
+			return Source.Type.FloatRanges[i].Mid; // Floats don't make sense in sticky land
+		}
 
 		public ISticky Source { get; set; }
 		public ISticky SourceStickyOr { get; set; }
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
index 214351a458..3b0f698434 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
@@ -36,19 +36,7 @@ namespace BizHawk.Client.Common
 
 		public string GenerateInputDisplay()
 		{
-			var le = GenerateLogEntry();
-			if (le == EmptyEntry)
-			{
-				return string.Empty;
-			}
-			
-			string neutral = "    0,";
-			if (_source.Type.FloatRanges.Count > 0)
-				neutral = _source.Type.FloatRanges[0].Mid.ToString().PadLeft(5, ' ') + ',';
-			return le
-				.Replace(".", " ")
-				.Replace("|", "")
-				.Replace(neutral, "      "); //zero 04-aug-2015 - changed from a 2-dimensional type string to support emptying out the one-dimensional PSX disc select control
+			return CreateLogEntry(forInputDisplay: true);
 		}
 
 		public bool IsEmpty
@@ -114,10 +102,12 @@ namespace BizHawk.Client.Common
 			return dict;
 		}
 
-		private string CreateLogEntry(bool createEmpty = false)
+		private string CreateLogEntry(bool createEmpty = false, bool forInputDisplay = false)
 		{
 			var sb = new StringBuilder();
-			sb.Append('|');
+
+			if (!forInputDisplay)
+				sb.Append('|');
 
 			foreach (var group in _source.Type.ControlsOrdered)
 			{
@@ -127,15 +117,23 @@ namespace BizHawk.Client.Common
 					{
 						if (_source.Type.FloatControls.Contains(button))
 						{
+							int val;
+							int i = _source.Type.FloatControls.IndexOf(button);
+							int mid = (int)_source.Type.FloatRanges[i].Mid;
+
 							if (createEmpty)
 							{
-								sb.Append("    0,");
+								val = mid;
 							}
 							else
 							{
-								var val = (int)_source.GetFloat(button);
-								sb.Append(val.ToString().PadLeft(5, ' ')).Append(',');
+								val = (int)_source.GetFloat(button);
 							}
+
+							if (forInputDisplay && val == mid)
+								sb.Append("      ");
+							else
+								sb.Append(val.ToString().PadLeft(5, ' ')).Append(',');
 						}
 						else if (_source.Type.BoolButtons.Contains(button))
 						{
@@ -145,12 +143,13 @@ namespace BizHawk.Client.Common
 							}
 							else
 							{
-								sb.Append(_source.IsPressed(button) ? Mnemonics[button] : '.');
+								sb.Append(_source.IsPressed(button) ? Mnemonics[button] : forInputDisplay ? ' ' : '.');
 							}
 						}
 					}
 
-					sb.Append('|');
+					if (!forInputDisplay)
+						sb.Append('|');
 				}
 			}