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

TasMovie loading, simplify a bit by not relying on the existing instance of TasStateManager to hold onto settings

This commit is contained in:
adelikat 2020-08-29 11:32:41 -05:00
parent be6b1fa6e4
commit 39ac8864b6
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
View File

@ -85,20 +85,6 @@ namespace BizHawk.Client.Common
LagLog.Load(tr);
});
bl.GetLump(BinaryStateLump.StateHistorySettings, false, delegate(TextReader tr)
{
var json = tr.ReadToEnd();
try
{
var settings = JsonConvert.DeserializeObject<ZwinderStateManagerSettings>(json);
TasStateManager.UpdateSettings(settings);
}
catch
{
// Do nothing, and use default settings instead
}
});
bl.GetLump(BinaryStateLump.Markers, false, delegate(TextReader tr)
{
string line;
@ -165,10 +151,24 @@ namespace BizHawk.Client.Common
}
});
ZwinderStateManagerSettings settings = new ZwinderStateManagerSettings();
bl.GetLump(BinaryStateLump.StateHistorySettings, false, delegate(TextReader tr)
{
var json = tr.ReadToEnd();
try
{
settings = JsonConvert.DeserializeObject<ZwinderStateManagerSettings>(json);
}
catch
{
// Do nothing, and use default settings instead
}
});
bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
{
TasStateManager?.Dispose();
TasStateManager = ZwinderStateManager.Create(br, TasStateManager.Settings, IsReserved);
TasStateManager = ZwinderStateManager.Create(br, settings, IsReserved);
});
}
}