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 IMovie.GetInput()

This commit is contained in:
adelikat 2014-06-19 00:37:42 +00:00
parent 9a16540e14
commit 19feaaa3ba
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.Common/lua/EmuLuaLibrary.Movie.cs
View File

@ -51,9 +51,11 @@ namespace BizHawk.Client.Common
)] )]
public string GetInputAsMnemonic(int frame) public string GetInputAsMnemonic(int frame)
{ {
if (frame < Global.MovieSession.Movie.InputLogLength) if (Global.MovieSession.Movie.IsActive && frame < Global.MovieSession.Movie.InputLogLength)
{ {
return Global.MovieSession.Movie.GetInput(frame); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(Global.MovieSession.Movie.GetInputState(frame));
return lg.GenerateLogEntry();
} }
return string.Empty; return string.Empty;

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

@ -255,13 +255,9 @@ namespace BizHawk.Client.EmuHawk
public string InputStrOrAll() public string InputStrOrAll()
{ {
var m = Global.MovieSession.MovieControllerInstance(); var m = Global.MovieSession.Movie.IsActive && !Global.MovieSession.Movie.IsFinished ?
Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1) :
if (Global.MovieSession.Movie.IsActive) Global.MovieSession.MovieControllerInstance();
{
m.SetControllersAsMnemonic(
Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
}
var orAdaptor = new ORAdapter() var orAdaptor = new ORAdapter()
{ {
@ -291,9 +287,9 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
var m = Global.MovieSession.MovieControllerInstance(); var m = Global.MovieSession.Movie.IsActive && !Global.MovieSession.Movie.IsFinished ?
m.SetControllersAsMnemonic( Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1) :
Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1)); Global.MovieSession.MovieControllerInstance();
var andAdaptor = new AndAdapter var andAdaptor = new AndAdapter
{ {