From 031eb5a282bda9615228601aff9e9f0303dc8e6b Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 19 Jun 2014 21:29:57 +0000 Subject: [PATCH] Some input display fixes for bk2 format --- .../movie/bk2/Bk2LogEntryGenerator.cs | 8 +++++++- BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs index 15acd07d97..6ae2e6cd3a 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs @@ -29,10 +29,16 @@ namespace BizHawk.Client.Common public string GenerateInputDisplay() { + var le = GenerateLogEntry(); + if (le == EmptyEntry) + { + return string.Empty; + } + return GenerateLogEntry() .Replace(".", " ") .Replace("|", "") - .Replace(" 000, 000", " "); + .Replace("000,000", " "); } public bool IsEmpty diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index a0578a8e3f..0e5702de5a 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -280,6 +280,16 @@ namespace BizHawk.Client.EmuHawk var lg = Global.MovieSession.LogGeneratorInstance(); lg.SetSource(stickyOr); + + var test = lg.GenerateInputDisplay(); + if (test.Trim() != string.Empty) + { + int zzz = 0; + zzz++; + int yyy = zzz; + yyy++; + } + return lg.GenerateInputDisplay(); }