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

tastudio: ban state removal per branch load. 

todo: figure out way to skip removal internally in StateToRemove().
This commit is contained in:
feos 2015-09-15 21:47:59 +03:00
parent b31c43321b
commit ce3c9364df
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,7 +478,7 @@ namespace BizHawk.Client.Common
StateManager.LoadBranch(Branches.IndexOf(branch));
StateManager.SetState(branch.Frame, branch.CoreData);
StateManager.SetState(branch.Frame, branch.CoreData, skipRemoval: true);
//ChangeLog = branch.ChangeLog;
Markers = branch.Markers;

13
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -313,7 +313,10 @@ namespace BizHawk.Client.Common
i = 0;
do
{
shouldRemove = findState(accessed[i]);
if (accessed.Count > i)
shouldRemove = findState(accessed[i]);
else
break;
// Keep marker states
markerSkips--;
@ -385,9 +388,11 @@ namespace BizHawk.Client.Common
Used += (ulong)States[index].Length;
}
internal void SetState(int frame, byte[] state)
internal void SetState(int frame, byte[] state, bool skipRemoval = false)
{
MaybeRemoveStates(); // Remove before adding so this state won't be removed.
if (!skipRemoval)
MaybeRemoveStates(); // Remove before adding so this state won't be removed.
if (States.ContainsKey(frame))
{
if (stateHasDuplicate(frame, -1) != -2)
@ -860,7 +865,7 @@ namespace BizHawk.Client.Common
continue; // TODO: It might be a better idea to just not put state 0 in BranchStates.
if (kvp.Value.ContainsKey(identifier))
SetState(kvp.Key, kvp.Value[identifier].State);
SetState(kvp.Key, kvp.Value[identifier].State, skipRemoval: true);
}
currentBranch = index;