here's how I think input display should work. also fixes your bug. also breaks something that had this comment (maybe)
// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
This commit is contained in:
parent
c0650c7860
commit
d4a48a8ee1
|
@ -133,10 +133,10 @@ namespace BizHawk.Client.Common
|
||||||
var input = Movie.GetInputState(Global.Emulator.Frame);
|
var input = Movie.GetInputState(Global.Emulator.Frame);
|
||||||
|
|
||||||
// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
|
// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
|
||||||
if (Global.Emulator.Frame == 0) // Hacky
|
//if (Global.Emulator.Frame == 0) // Hacky
|
||||||
{
|
//{
|
||||||
HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
|
// HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
|
||||||
}
|
//}
|
||||||
|
|
||||||
if (input == null)
|
if (input == null)
|
||||||
{
|
{
|
||||||
|
@ -327,6 +327,10 @@ namespace BizHawk.Client.Common
|
||||||
{
|
{
|
||||||
HandlePlaybackEnd();
|
HandlePlaybackEnd();
|
||||||
}
|
}
|
||||||
|
else if (Movie.IsPlaying && !Movie.IsFinished)
|
||||||
|
{
|
||||||
|
LatchInputFromLog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HandleMovieLoadState(string path)
|
public bool HandleMovieLoadState(string path)
|
||||||
|
@ -456,6 +460,7 @@ namespace BizHawk.Client.Common
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Movie.StartNewPlayback();
|
Movie.StartNewPlayback();
|
||||||
|
LatchInputFromLog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue