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

tastudio: tsm never actually uses currentBranch, so why should it have it? 

Revert "make sln version 2010 again." This reverts commit 48a59f1cef.
It's now known that to make newer .sln compatible to VS2010, one should install SP1.
This commit is contained in:
feos 2015-10-24 16:29:37 +03:00
parent 48a59f1cef
commit fd2e6848f1
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,6 @@ namespace BizHawk.Client.Common
public void SaveBranchStates(BinaryWriter bw) public void SaveBranchStates(BinaryWriter bw)
{ {
bw.Write(currentBranch);
if (Settings.BranchStatesInTasproj) if (Settings.BranchStatesInTasproj)
{ {
bw.Write(BranchStates.Count); bw.Write(BranchStates.Count);
@ -605,7 +604,6 @@ namespace BizHawk.Client.Common
public void LoadBranchStates(BinaryReader br) public void LoadBranchStates(BinaryReader br)
{ {
currentBranch = br.ReadInt32();
if (Settings.BranchStatesInTasproj) if (Settings.BranchStatesInTasproj)
{ {
try try
@ -705,7 +703,6 @@ namespace BizHawk.Client.Common
#region "Branches" #region "Branches"
private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>(); private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>();
private int currentBranch = -1;
/// <summary> /// <summary>
/// Checks if the state at frame in the given branch (-1 for current) has any duplicates. /// Checks if the state at frame in the given branch (-1 for current) has any duplicates.
@ -782,7 +779,6 @@ namespace BizHawk.Client.Common
stateList.Add(branchHash, kvp.Value); stateList.Add(branchHash, kvp.Value);
Used += (ulong)stateList[branchHash].Length; Used += (ulong)stateList[branchHash].Length;
} }
currentBranch = _movie.BranchCount;
} }
public void RemoveBranch(int index) public void RemoveBranch(int index)
@ -810,10 +806,6 @@ namespace BizHawk.Client.Common
if (stateList.Count == 0) if (stateList.Count == 0)
BranchStates.Remove(kvp.Key); BranchStates.Remove(kvp.Key);
} }
if (currentBranch > index)
currentBranch--;
else if (currentBranch == index)
currentBranch = -1;
} }
public void UpdateBranch(int index) public void UpdateBranch(int index)
@ -859,7 +851,6 @@ namespace BizHawk.Client.Common
stateList.Add(branchHash, kvp.Value); stateList.Add(branchHash, kvp.Value);
Used += (ulong)stateList[branchHash].Length; Used += (ulong)stateList[branchHash].Length;
} }
currentBranch = index;
} }
public void LoadBranch(int index) public void LoadBranch(int index)
@ -876,8 +867,6 @@ namespace BizHawk.Client.Common
if (kvp.Value.ContainsKey(branchHash)) if (kvp.Value.ContainsKey(branchHash))
SetState(kvp.Key, kvp.Value[branchHash].State); SetState(kvp.Key, kvp.Value[branchHash].State);
} }
currentBranch = index;
} }
#endregion #endregion

4
BizHawk.sln
View File

@ -1,6 +1,6 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"