tastudio: fuck this

Dwedit · Feb 20, 2018 · 7ae374d · 7ae374d
1 parent 92ec683
commit 7ae374d
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 675 deletions.
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -157,7 +157,7 @@ public static TasMovie ConvertToSavestateAnchoredMovie(this TasMovie old, int fr
 			// States can't be easily moved over, because they contain the frame number.
 			// TODO? I'm not sure how this would be done.
 			tas.TasStateManager.MountWriteAccess();
-			old.TasStateManager.Clear();
+			old.TasStateManager.ClearStateHistory();
 
 			// Lag Log
 			tas.TasLagLog.FromLagLog(old.TasLagLog);
@@ -221,7 +221,7 @@ public static TasMovie ConvertToSaveRamAnchoredMovie(this TasMovie old, byte[] s
 			}
 
 			var tas = new TasMovie(newFilename, true) { SaveRam = saveRam };
-			tas.TasStateManager.Clear();
+			tas.TasStateManager.ClearStateHistory();
 			tas.ClearLagLog();
 
 			var entries = old.GetLogEntries();

diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -62,10 +62,6 @@ protected override void Write(string fn, bool backup = false)
 				if (Branches.Any())
 				{
 					Branches.Save(bs);
-					if (_stateManager.Settings.BranchStatesInTasproj)
-					{
-						bs.PutLump(BinaryStateLump.BranchStateHistory, (BinaryWriter bw) => _stateManager.SaveBranchStates(bw));
-					}
 				}
 
 				bs.PutLump(BinaryStateLump.Session, tw => tw.WriteLine(Session.ToString()));
@@ -245,13 +241,6 @@ public override bool Load(bool preload)
 				});
 
 				Branches.Load(bl, this);
-				if (_stateManager.Settings.BranchStatesInTasproj)
-				{
-					bl.GetLump(BinaryStateLump.BranchStateHistory, false, delegate(BinaryReader br, long length)
-					{
-						_stateManager.LoadBranchStates(br);
-					});
-				}
 
 				bl.GetLump(BinaryStateLump.Session, false, delegate(TextReader tr)
 				{
@@ -283,7 +272,7 @@ public override bool Load(bool preload)
 		private void ClearTasprojExtras()
 		{
 			_lagLog.Clear();
-			_stateManager.Clear();
+			_stateManager.ClearStateHistory();
 			Markers.Clear();
 			ChangeLog.ClearLog();
 		}

diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -497,13 +497,11 @@ public int BranchIndexByFrame(int frame)
 		public void AddBranch(TasBranch branch)
 		{
 			Branches.Add(branch);
-			TasStateManager.AddBranch();
 			Changes = true;
 		}
 
 		public void RemoveBranch(TasBranch branch)
 		{
-			TasStateManager.RemoveBranch(Branches.IndexOf(branch));
 			Branches.Remove(branch);
 			Changes = true;
 		}
@@ -527,9 +525,6 @@ public void LoadBranch(TasBranch branch)
 			{
 				_stateManager.Invalidate(branch.InputLog.Count);
 			}
-
-			_stateManager.LoadBranch(Branches.IndexOf(branch));
-			_stateManager.SetState(branch.Frame, branch.CoreData);
 
 			if (BindMarkersToInput) // pretty critical not to erase them
 			{
@@ -549,7 +544,6 @@ public void UpdateBranch(TasBranch old, TasBranch newBranch)
 			}
 
 			Branches[index] = newBranch;
-			TasStateManager.UpdateBranch(index);
 			Changes = true;
 		}