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

tastudio: found another bomb set by picking branch states by index. two actually.

This commit is contained in:
feos 2015-10-05 00:24:41 +03:00
parent 89d919e6a9
commit 87dd32eeac
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ namespace BizHawk.Client.Common
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
{
if (_movie.GetBranch(branch).Markers == null)
if (_movie.GetBranch(_movie.BranchIndexByHash(branch)).Markers == null)
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
return _movie.GetBranch(branch).Markers.Any(m => m.Frame + 1 == frame);
@ -727,7 +727,10 @@ namespace BizHawk.Client.Common
if (!States.ContainsValue(s))
{
if (BranchStates.ContainsKey(s.Frame))
ret.Y = BranchStates[s.Frame].Values.IndexOf(s);
{
int index = BranchStates[s.Frame].Values.IndexOf(s);
ret.Y = BranchStates[s.Frame].Keys.ElementAt(index);
}
if (ret.Y == -1)
return new Point(-1, -2);
}