ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't generate `LogKey:` in GenerateLogKey 

this would cause `LogKey:LogKey:...` to get written when setting the value with the result of a GenerateLogKey call.
Luckily this was not an issue for us because the reading code indescriminately replaces all occurances of `LogKey` with nothing.
This commit is contained in:
Morilli 2024-06-09 20:01:34 +02:00
parent 0a95d86094
commit c94c3a6fb1
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
View File

@ -54,7 +54,6 @@ namespace BizHawk.Client.Common
public string GenerateLogKey()
{
var sb = new StringBuilder();
sb.Append("LogKey:");
foreach (var group in _source.Definition.ControlsOrdered.Where(static c => c.Count is not 0))
{

11
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs
View File

@ -13,15 +13,8 @@ namespace BizHawk.Client.Common
public void WriteInputLog(TextWriter writer)
{
writer.WriteLine("[Input]");
if (string.IsNullOrEmpty(LogKey))
{
var lg = LogGeneratorInstance(Session.MovieController);
writer.WriteLine(lg.GenerateLogKey());
}
else
{
writer.WriteLine($"LogKey:{LogKey}");
}
writer.Write("LogKey:");
writer.WriteLine(string.IsNullOrEmpty(LogKey) ? LogGeneratorInstance(Session.MovieController).GenerateLogKey() : LogKey);
foreach (var record in Log)
{

7
src/BizHawk.Client.Common/movie/import/SmvImport.cs
View File

@ -190,9 +190,10 @@ namespace BizHawk.Client.Common.movie.import
Result.Movie.HeaderEntries[HeaderKeys.GameName] = gameName;
}
var _controllers = new Snes9xControllers(ss);
Result.Movie.LogKey = new Bk2LogEntryGenerator("SNES", new Bk2Controller(_controllers.ControllerDefinition)).GenerateLogKey();
SimpleController controllers = new(_controllers.ControllerDefinition);
ControllerDefinition definition = new Snes9xControllers(ss).ControllerDefinition;
SimpleController controllers = new(definition);
Result.Movie.LogKey = new Bk2LogEntryGenerator(VSystemID.Raw.SNES, new Bk2Controller(definition)).GenerateLogKey();
r.BaseStream.Position = firstFrameOffset;
/*

4
src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk
// Update the selected zone's key
var lg = MovieSession.Movie.LogGeneratorInstance(MovieSession.MovieController);
string key = lg.GenerateLogKey();
key = key.Replace("LogKey:", "").Replace("#", "");
key = key.Replace("#", "");
foreach (var box in _buttonBoxes)
{
@ -88,4 +88,4 @@ namespace BizHawk.Client.EmuHawk
PositionBoxes();
}
}
}
}

6
src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
key = lg.GenerateLogKey();
}
key = key.Replace("LogKey:", "").Replace("#", "");
key = key.Replace("#", "");
key = key.Substring(startIndex: 0, length: key.Length - 1); // drop last char
_inputKey = key;
@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
var logGenerator = movieSession.Movie.LogGeneratorInstance(_controller);
logGenerator.GenerateLogEntry(); // Reference and create all buttons.
string movieKey = logGenerator.GenerateLogKey().Replace("LogKey:", "").Replace("#", "");
string movieKey = logGenerator.GenerateLogKey().Replace("#", "");
movieKey = movieKey.Substring(startIndex: 0, length: movieKey.Length - 1); // drop last char
if (key == movieKey)
{
@ -238,7 +238,7 @@ namespace BizHawk.Client.EmuHawk
_inputKey = readText[0];
var lg = _movieSession.Movie.LogGeneratorInstance(_movieSession.MovieController);
string key = lg.GenerateLogKey();
key = key.Replace("LogKey:", "").Replace("#", "");
key = key.Replace("#", "");
key = key.Substring(startIndex: 0, length: key.Length - 1); // drop last char
string[] emuKeys = key.Split('|');
string[] macroKeys = _inputKey.Split('|');