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

remove the "poke frame" hotkey, as this is a very legacy feature, we have a whole tool for this now

This commit is contained in:
adelikat 2020-06-04 15:22:29 -05:00
parent ea6fd0ebad
commit d86aabb8b5
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/config/Binding.cs
View File

@ -191,7 +191,6 @@ namespace BizHawk.Client.Common
Bind("Movie", "MT Select None"), Bind("Movie", "MT Select None"),
Bind("Movie", "MT Increment Player"), Bind("Movie", "MT Increment Player"),
Bind("Movie", "MT Decrement Player"), Bind("Movie", "MT Decrement Player"),
Bind("Movie", "Movie Poke"),
Bind("Movie", "Scrub Input"), Bind("Movie", "Scrub Input"),
Bind("Tools", "RAM Watch"), Bind("Tools", "RAM Watch"),

2
src/BizHawk.Client.Common/config/MovieConfig.cs
View File

@ -7,7 +7,6 @@
public bool MoviesOnDisk { get; } public bool MoviesOnDisk { get; }
public int MovieCompressionLevel { get; } public int MovieCompressionLevel { get; }
public bool VBAStyleMovieLoadState { get; } public bool VBAStyleMovieLoadState { get; }
public bool MoviePlaybackPokeMode { get; }
} }
public class MovieConfig : IMovieConfig public class MovieConfig : IMovieConfig
@ -17,6 +16,5 @@
public bool MoviesOnDisk { get; set; } public bool MoviesOnDisk { get; set; }
public int MovieCompressionLevel { get; set; } = 2; public int MovieCompressionLevel { get; set; } = 2;
public bool VBAStyleMovieLoadState { get; set; } public bool VBAStyleMovieLoadState { get; set; }
public bool MoviePlaybackPokeMode { get; set; }
} }
} }

15
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -123,21 +123,6 @@ namespace BizHawk.Client.Common
LatchInputToUser(); LatchInputToUser();
ClearFrame(); ClearFrame();
} }
else if (Settings.MoviePlaybackPokeMode)
{
LatchInputToUser();
var lg = Movie.LogGeneratorInstance(Global.InputManager.MovieOutputHardpoint);
if (!lg.IsEmpty)
{
LatchInputToUser();
Movie.PokeFrame(Movie.Emulator.Frame, Global.InputManager.MovieOutputHardpoint);
}
else
{
// Why, this was already done?
LatchInputToLog();
}
}
} }
} }
} }

3
src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -314,9 +314,6 @@ namespace BizHawk.Client.EmuHawk
case "MT Decrement Player": case "MT Decrement Player":
MovieSession.MultiTrack.Decrement(); MovieSession.MultiTrack.Decrement();
break; break;
case "Movie Poke":
ToggleModePokeMode();
break;
// Tools // Tools
case "RAM Watch": case "RAM Watch":

6
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2651,12 +2651,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void ToggleModePokeMode()
{
Config.Movies.MoviePlaybackPokeMode ^= true;
AddOnScreenMessage($"Movie Poke mode {(Config.Movies.MoviePlaybackPokeMode ? "enabled" : "disabled")}");
}
private void ToggleBackgroundInput() private void ToggleBackgroundInput()
{ {
Config.AcceptBackgroundInput ^= true; Config.AcceptBackgroundInput ^= true;