From 1068735779344ab04a297318643229410c187792 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 28 Mar 2019 14:00:09 +1000 Subject: [PATCH] Extract helper method --- .../movie/bk2/Bk2LogEntryGenerator.cs | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs index 0ee9ad7fb6..93a09a0ad1 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs @@ -73,26 +73,33 @@ namespace BizHawk.Client.Common return dict; } + private string CreateLogEntryHelper(string button, bool createEmpty, bool forInputDisplay) + { + if (_source.Definition.FloatControls.Contains(button)) + { + var mid = (int)_source.Definition.FloatRanges[_source.Definition.FloatControls.IndexOf(button)].Mid; + var val = createEmpty ? mid : (int)_source.GetFloat(button); + return forInputDisplay && val == mid ? " " : $"{val,5},"; + } + + if (_source.Definition.BoolButtons.Contains(button)) + { + return (createEmpty + ? '.' + : _source.IsPressed(button) + ? _mnemonics[button] + : forInputDisplay + ? ' ' + : '.').ToString(); + } + + return string.Empty; + } + private string CreateLogEntry(bool createEmpty = false, bool forInputDisplay = false) { - var list = _source.Definition.ControlsOrdered.Select(group => string.Concat(group.Select( - button => { - if (_source.Definition.FloatControls.Contains(button)) - { - var mid = (int)_source.Definition.FloatRanges[_source.Definition.FloatControls.IndexOf(button)].Mid; - var val = createEmpty ? mid : (int)_source.GetFloat(button); - return forInputDisplay && val == mid ? " " : $"{val,5},"; - } - else if (_source.Definition.BoolButtons.Contains(button)) - return (createEmpty - ? '.' - : _source.IsPressed(button) - ? _mnemonics[button] - : forInputDisplay - ? ' ' - : '.').ToString(); - else return string.Empty; - }))); + var list = _source.Definition.ControlsOrdered.Select(group => + string.Concat(group.Select(button => CreateLogEntryHelper(button, createEmpty, forInputDisplay)))); return forInputDisplay ? string.Concat(list) : $"|{string.Join("|", list)}|"; } }