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

Tastudio branches - invalidate lag log on branch load for now, even though the information is saved in branches and is valid (todo: a better design or quit saving this info). Also don't load the changelog from branches, again, don't save this info if this isn't desired.

This commit is contained in:
adelikat 2015-07-25 18:02:58 -04:00
parent ce6623ba39
commit 182ce33a3c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
View File

@ -177,8 +177,8 @@ namespace BizHawk.Client.Common
public void FromLagLog(TasLagLog log)
{
LagLog = log.LagLog;
WasLag = log.WasLag;
LagLog = log.LagLog.ToList();
WasLag = log.WasLag.ToList();
}
public void StartFromFrame(int index)

10
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -461,10 +461,14 @@ namespace BizHawk.Client.Common
_log = branch.InputLog;
_changes = true;
LagLog.FromLagLog(branch.LagLog);
if (divergentPoint.HasValue)
{
StateManager.Invalidate(divergentPoint.Value);
// For now, even though we loaded the lag log, we are invalidating it the same as savestates to show the user the space isn't navigatable without re-emulating
LagLog.RemoveFrom(divergentPoint.Value);
}
else
{
@ -472,9 +476,9 @@ namespace BizHawk.Client.Common
}
StateManager.SetState(branch.Frame, branch.CoreData);
//LagLog.Clear(); LagLog and InputLog is the same reference as what's in the branch!
LagLog.FromLagLog(branch.LagLog);
ChangeLog = branch.ChangeLog;
// TODO: we save the changelog, but not to disk, also this may not be intended behavior
//ChangeLog = branch.ChangeLog;
}
// TODO: use LogGenerators rather than string comparisons