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

Restore input to the user after StopMovie or going into Movie Finished Mode

This commit is contained in:
andres.delikat 2011-05-13 20:02:28 +00:00
parent d95681c39e
commit 3ccd1b1f66
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.MultiClient/Input/ControllerBinding.cs
View File

@ -330,14 +330,6 @@ namespace BizHawk.MultiClient
if (mnemonic[8] != '.') programmaticallyPressedButtons.Add("Select"); if (mnemonic[8] != '.') programmaticallyPressedButtons.Add("Select");
if (mnemonic[9] != '.') programmaticallyPressedButtons.Add("B"); if (mnemonic[9] != '.') programmaticallyPressedButtons.Add("B");
if (mnemonic[10] != '.') programmaticallyPressedButtons.Add("A"); if (mnemonic[10] != '.') programmaticallyPressedButtons.Add("A");
} }
} }
} }

5
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -132,8 +132,11 @@ namespace BizHawk.MultiClient
public void StopUserMovie() public void StopUserMovie()
{ {
if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD) if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
{
UserMovie.StopMovie(); UserMovie.StopMovie();
Global.ActiveController.MovieMode = false;
}
} }
public void StopInputLog() public void StopInputLog()

3
BizHawk.MultiClient/MainForm.cs
View File

@ -998,7 +998,10 @@ namespace BizHawk.MultiClient
{ {
Movie m = GetActiveMovie(); Movie m = GetActiveMovie();
if (m.GetMovieLength() == Global.Emulator.Frame && m.GetMovieMode() == MOVIEMODE.PLAY) if (m.GetMovieLength() == Global.Emulator.Frame && m.GetMovieMode() == MOVIEMODE.PLAY)
{
m.SetMovieFinished(); m.SetMovieFinished();
Global.ActiveController.MovieMode = false;
}
if (m.GetMovieMode() == MOVIEMODE.PLAY) if (m.GetMovieMode() == MOVIEMODE.PLAY)
Global.ActiveController.SetControllersAsMnemonic(m.GetInputFrame(Global.Emulator.Frame) + 1); Global.ActiveController.SetControllersAsMnemonic(m.GetInputFrame(Global.Emulator.Frame) + 1);
} }