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

some cleanups

This commit is contained in:
adelikat 2019-06-15 18:38:56 -05:00
parent cb4b7d7089
commit 5075160355
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -41,7 +41,6 @@ namespace BizHawk.Client.Common
public TasMovieRecord this[int index] => new TasMovieRecord
{
// State = StateManager[index],
HasState = _stateManager.HasState(index),
LogEntry = GetInputLogEntry(index),
Lagged = _lagLog[index + 1],
@ -246,14 +245,6 @@ namespace BizHawk.Client.Common
_lagLog.Clear();
}
public void DeleteLogBefore(int frame)
{
if (frame < Log.Count)
{
Log.RemoveRange(0, frame);
}
}
public void CopyLog(IEnumerable<string> log)
{
Log.Clear();
@ -276,7 +267,7 @@ namespace BizHawk.Client.Common
return Log;
}
private int? _timelineBranchFrame = null;
private int? _timelineBranchFrame;
// TODO: this is 99% copy pasting of bad code
public override bool ExtractInputLog(TextReader reader, out string errorMessage)

7
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -739,7 +739,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
MovieZone loadZone = new MovieZone(path)
var loadZone = new MovieZone(path)
{
Start = TasView.FirstSelectedIndex.Value
};
@ -864,7 +864,6 @@ namespace BizHawk.Client.EmuHawk
TasView.Refresh();
//SetSplicer();
CurrentTasMovie.FlushInputCache();
CurrentTasMovie.UseInputCache = false;
@ -895,11 +894,13 @@ namespace BizHawk.Client.EmuHawk
private void StartAtNearestFrameAndEmulate(int frame, bool fromLua, bool fromRewinding)
{
if (frame == Emulator.Frame)
{
return;
}
_unpauseAfterSeeking = (fromRewinding || WasRecording) && !Mainform.EmulatorPaused;
TastudioPlayMode();
KeyValuePair<int, byte[]> closestState = CurrentTasMovie.TasStateManager.GetStateClosestToFrame(frame);
var closestState = CurrentTasMovie.TasStateManager.GetStateClosestToFrame(frame);
if (closestState.Value.Length > 0 && (frame < Emulator.Frame || closestState.Key > Emulator.Frame))
{
LoadState(closestState);

1
BizHawk.sln.DotSettings
View File

@ -174,6 +174,7 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=addr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Autosave/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=greenzone/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=savestate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=savestates/@EntryIndexedValue">True</s:Boolean>