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

use Session.Settings more in movie classes now that it is never null

This commit is contained in:
adelikat 2020-06-05 21:17:41 -05:00
parent 55bb627550
commit 069bdddbba
2 changed files with 6 additions and 6 deletions
src/BizHawk.Client.Common/movie
bk2
Bk2Movie.InputLog.cs
tasproj
TasMovie.cs

6
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs
View File

@ -41,7 +41,7 @@ namespace BizHawk.Client.Common
// We are in record mode so replace the movie log with the one from the savestate
if (!Session.MultiTrack.IsActive)
{
if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0)
if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0)
{
SaveBackup();
MakeBackup = false;
@ -124,14 +124,14 @@ namespace BizHawk.Client.Common
if (stateFramei.StrictlyBoundedBy(0.RangeTo(Log.Count)))
{
if (!Global.Config.Movies.VBAStyleMovieLoadState)
if (!Session.Settings.VBAStyleMovieLoadState)
{
Truncate(stateFramei);
}
}
else if (stateFramei > Log.Count) // Post movie savestate
{
if (!Global.Config.Movies.VBAStyleMovieLoadState)
if (!Session.Settings.VBAStyleMovieLoadState)
{
Truncate(Log.Count);
}

6
src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -184,7 +184,7 @@ namespace BizHawk.Client.Common
int? timelineBranchFrame = null;
// We are in record mode so replace the movie log with the one from the savestate
if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0)
if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0)
{
SaveBackup();
MakeBackup = false;
@ -240,14 +240,14 @@ namespace BizHawk.Client.Common
if (stateFrameValue > 0 && stateFrameValue < Log.Count)
{
if (!Global.Config.Movies.VBAStyleMovieLoadState)
if (!Session.Settings.VBAStyleMovieLoadState)
{
Truncate(stateFrameValue);
}
}
else if (stateFrameValue > Log.Count) // Post movie savestate
{
if (!Global.Config.Movies.VBAStyleMovieLoadState)
if (!Session.Settings.VBAStyleMovieLoadState)
{
Truncate(Log.Count);
}