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

Oops! Fix Movie Playback during poke mode

This commit is contained in:
adelikat 2013-03-10 00:06:40 +00:00
parent 168299f794
commit 240a9e3a45
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.MultiClient/MainForm.Movie.cs
View File

@ -299,7 +299,17 @@ namespace BizHawk.MultiClient
else if (TAStudio1.IsHandleCreated && !TAStudio1.IsDisposed || Global.Config.MoviePlaybackPokeMode)
{
Global.MovieSession.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
Global.MovieSession.Movie.PokeFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint);
MnemonicsGenerator mg = new MnemonicsGenerator();
mg.SetSource( Global.MovieOutputHardpoint);
if (!mg.IsEmpty)
{
Global.MovieSession.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
Global.MovieSession.Movie.PokeFrame(Global.Emulator.Frame, mg.GetControllersAsMnemonic());
}
else
{
Global.MovieSession.LatchInputFromLog();
}
}
}
}

11
BizHawk.MultiClient/movie/Movie.cs
View File

@ -578,15 +578,10 @@ namespace BizHawk.MultiClient
}
}
public void PokeFrame(int frameNum, IController source)
public void PokeFrame(int frameNum, string input)
{
MnemonicsGenerator mg = new MnemonicsGenerator();
mg.SetSource(source);
if (!mg.IsEmpty)
{
changes = true;
Log.SetFrameAt(frameNum, mg.GetControllersAsMnemonic());
}
changes = true;
Log.SetFrameAt(frameNum, input);
}
public void CommitFrame(int frameNum, IController source)