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

Remove some more usages of GetInput()

This commit is contained in:
adelikat 2014-06-18 02:39:29 +00:00
parent 176c306439
commit 3eff547413
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -223,9 +223,10 @@ namespace BizHawk.Client.EmuHawk
public string InputStrMovie() public string InputStrMovie()
{ {
var sb = new StringBuilder(Global.MovieSession.Movie.GetInput(Global.Emulator.Frame)); var lg = Global.MovieSession.Movie.LogGeneratorInstance();
sb.Replace(".", " ").Replace("|", "").Replace(" 000, 000", " "); lg.SetSource(Global.MovieSession.MovieControllerAdapter);
return sb.ToString();
return lg.GenerateInputDisplay();
} }
public string InputStrImmediate() public string InputStrImmediate()
@ -240,9 +241,9 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
var sb = new StringBuilder(Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1)); var lg = Global.MovieSession.Movie.LogGeneratorInstance();
sb.Replace(".", " ").Replace("|", "").Replace(" 000, 000", " "); lg.SetSource(Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1));
return sb.ToString(); return lg.GenerateInputDisplay();
} }
return string.Empty; return string.Empty;

9
BizHawk.Client.EmuHawk/tools/VirtualPads/AnalogControlPanel.cs
View File

@ -88,13 +88,10 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished) if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
{ {
var logEntry = Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1); var input = Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1);
var lg = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter;
lg.Type = Global.MovieSession.MovieControllerAdapter.Type;
lg.SetControllersAsMnemonic(logEntry);
var x = lg.GetFloat(Controller + " X Axis"); var x = input.GetFloat(Controller + " X Axis");
var y = lg.GetFloat(Controller + " Y Axis"); var y = input.GetFloat(Controller + " Y Axis");
var xx = RealToGFX((int)x); var xx = RealToGFX((int)x);
var yy = RealToGFX((int)y); var yy = RealToGFX((int)y);