From 915abb9504bd1d08afa96c3856c63306a269c7e8 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sat, 3 Oct 2015 19:20:18 -0400
Subject: [PATCH] Stuff

---
 .../movie/tasproj/StateManagerState.cs        | 15 +++++++++
 .../movie/tasproj/TasStateManager.cs          | 32 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/BizHawk.Client.Common/movie/tasproj/StateManagerState.cs b/BizHawk.Client.Common/movie/tasproj/StateManagerState.cs
index c4012ac9d7..c1a6801f47 100644
--- a/BizHawk.Client.Common/movie/tasproj/StateManagerState.cs
+++ b/BizHawk.Client.Common/movie/tasproj/StateManagerState.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 
 namespace BizHawk.Client.Common
 {
@@ -15,6 +16,20 @@ namespace BizHawk.Client.Common
 
 		public int Frame { get; set; }
 
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Frame);
+			w.Write(_state.Length);
+			w.Write(_state);
+		}
+
+		public static StateManagerState Read(BinaryReader r, TasStateManager m)
+		{
+			int frame = r.ReadInt32();
+			byte[] data = r.ReadBytes(r.ReadInt32());
+			return new StateManagerState(m, data, frame);
+		}
+
 		public byte[] State
 		{
 			get
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 1858794af2..e40785fc73 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -520,6 +520,19 @@ namespace BizHawk.Client.Common
 				bw.Write(kvp.Value.Length);
 				bw.Write(kvp.Value.State);
 			}
+
+			bw.Write(currentBranch);
+			bw.Write(BranchStates.Count);
+			foreach (var s in BranchStates)
+			{
+				bw.Write(s.Key);
+				bw.Write(s.Value.Count);
+				foreach (var t in s.Value)
+				{
+					bw.Write(t.Key);
+					t.Value.Write(bw);
+				}
+			}
 		}
 
 		private List<int> ExcludeStates()
@@ -574,6 +587,25 @@ namespace BizHawk.Client.Common
 				//Used += len;
 			}
 			//}
+
+			currentBranch = br.ReadInt32();
+			int c = br.ReadInt32();
+			BranchStates = new SortedList<int, SortedList<int, StateManagerState>>(c);
+			while (c > 0)
+			{
+				int key = br.ReadInt32();
+				int c2 = br.ReadInt32();
+				var list = new SortedList<int, StateManagerState>(c2);
+				while (c2 > 0)
+				{
+					int key2 = br.ReadInt32();
+					var state = StateManagerState.Read(br, this);
+					list.Add(key2, state);
+					c2--;
+				}
+				BranchStates.Add(key, list);
+				c--;
+			}
 		}
 
 		public KeyValuePair<int, byte[]> GetStateClosestToFrame(int frame)