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

If movie is in Movie Finished mode and rewound, go back to playback mode

This commit is contained in:
andres.delikat 2011-05-22 13:29:32 +00:00
parent 555d7b17c6
commit 2e71a9ab93
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.MultiClient/MainForm.cs
View File

@ -1085,16 +1085,24 @@ namespace BizHawk.MultiClient
else if (!Global.Config.MuteFrameAdvance) else if (!Global.Config.MuteFrameAdvance)
genSound = true; genSound = true;
if (MovieActive()) if (UserMovie.GetMovieMode() == MOVIEMODE.PLAY)
{ {
Movie m = GetActiveMovie(); if (UserMovie.GetMovieLength() == Global.Emulator.Frame)
if (m.GetMovieLength() == Global.Emulator.Frame && m.GetMovieMode() == MOVIEMODE.PLAY)
{ {
m.SetMovieFinished(); UserMovie.SetMovieFinished();
Global.ActiveController.MovieMode = false; Global.ActiveController.MovieMode = false;
} }
if (m.GetMovieMode() == MOVIEMODE.PLAY) else
Global.ActiveController.SetControllersAsMnemonic(m.GetInputFrame(Global.Emulator.Frame) + 1); Global.ActiveController.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame) + 1);
}
if (UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
{
if (UserMovie.GetMovieLength() > Global.Emulator.Frame)
{
UserMovie.StartPlayback();
Global.ActiveController.SetControllersAsMnemonic(UserMovie.GetInputFrame(Global.Emulator.Frame) + 1);
}
} }
Global.Emulator.FrameAdvance(!throttle.skipnextframe); Global.Emulator.FrameAdvance(!throttle.skipnextframe);
RamWatch1.UpdateValues(); RamWatch1.UpdateValues();