(guess) Remove `PreviousType.LastSearch` (RAM Search)

This commit is contained in:
YoshiRulz 2024-08-16 23:39:55 +10:00
parent 233a337b91
commit 97adf1a87d
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
5 changed files with 1 additions and 29 deletions

View File

@ -106,11 +106,6 @@ namespace BizHawk.Client.Common.RamSearchEngine
Compare.Difference => CompareDifference(_watchList).ToArray(), Compare.Difference => CompareDifference(_watchList).ToArray(),
_ => ComparePrevious(_watchList).ToArray() _ => ComparePrevious(_watchList).ToArray()
}; };
if (_settings.PreviousType == PreviousType.LastSearch)
{
SetPreviousToCurrent();
}
} }
if (UndoEnabled) if (UndoEnabled)

View File

@ -15,7 +15,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
Domain = memoryDomains.MainMemory; Domain = memoryDomains.MainMemory;
CheckMisAligned = false; CheckMisAligned = false;
PreviousType = PreviousType.LastSearch; PreviousType = PreviousType.LastFrame;
UseUndoHistory = useUndoHistory; UseUndoHistory = useUndoHistory;
} }

View File

@ -3,7 +3,6 @@
public enum PreviousType public enum PreviousType
{ {
Original = 0, Original = 0,
LastSearch = 1,
LastFrame = 2, LastFrame = 2,
LastChange = 3, LastChange = 3,
} }

View File

@ -72,7 +72,6 @@ namespace BizHawk.Client.EmuHawk
this.DisplayTypeSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DisplayTypeSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.DefinePreviousValueSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DefinePreviousValueSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.Previous_LastSearchMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.PreviousFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PreviousFrameMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.Previous_OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Previous_OriginalMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.Previous_LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Previous_LastChangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -401,18 +400,12 @@ namespace BizHawk.Client.EmuHawk
// DefinePreviousValueSubMenu // DefinePreviousValueSubMenu
// //
this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Previous_LastSearchMenuItem,
this.PreviousFrameMenuItem, this.PreviousFrameMenuItem,
this.Previous_OriginalMenuItem, this.Previous_OriginalMenuItem,
this.Previous_LastChangeMenuItem}); this.Previous_LastChangeMenuItem});
this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; this.DefinePreviousValueSubMenu.Text = "Define Previous Value";
this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened);
// //
// Previous_LastSearchMenuItem
//
this.Previous_LastSearchMenuItem.Text = "Last &Search";
this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click);
//
// PreviousFrameMenuItem // PreviousFrameMenuItem
// //
this.PreviousFrameMenuItem.Text = "&Previous Frame"; this.PreviousFrameMenuItem.Text = "&Previous Frame";
@ -1137,7 +1130,6 @@ namespace BizHawk.Client.EmuHawk
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx DefinePreviousValueSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx DefinePreviousValueSubMenu;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx PreviousFrameMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PreviousFrameMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_LastSearchMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_OriginalMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx Previous_OriginalMenuItem;
private System.Windows.Forms.GroupBox CompareToBox; private System.Windows.Forms.GroupBox CompareToBox;
private System.Windows.Forms.RadioButton DifferenceRadio; private System.Windows.Forms.RadioButton DifferenceRadio;

View File

@ -784,11 +784,6 @@ namespace BizHawk.Client.EmuHawk
_settings.Mode = SearchMode.Fast; _settings.Mode = SearchMode.Fast;
_searches.SetMode(SearchMode.Fast); _searches.SetMode(SearchMode.Fast);
if (_settings.PreviousType == PreviousType.LastFrame || _settings.PreviousType == PreviousType.LastChange)
{
SetPreviousType(PreviousType.LastSearch);
}
NumberOfChangesRadio.Enabled = false; NumberOfChangesRadio.Enabled = false;
NumberOfChangesBox.Enabled = false; NumberOfChangesBox.Enabled = false;
NumberOfChangesBox.Text = ""; NumberOfChangesBox.Text = "";
@ -1084,7 +1079,6 @@ namespace BizHawk.Client.EmuHawk
private void DefinePreviousValueSubMenu_DropDownOpened(object sender, EventArgs e) private void DefinePreviousValueSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
Previous_LastSearchMenuItem.Checked = false;
PreviousFrameMenuItem.Checked = false; PreviousFrameMenuItem.Checked = false;
Previous_OriginalMenuItem.Checked = false; Previous_OriginalMenuItem.Checked = false;
Previous_LastChangeMenuItem.Checked = false; Previous_LastChangeMenuItem.Checked = false;
@ -1092,9 +1086,6 @@ namespace BizHawk.Client.EmuHawk
switch (_settings.PreviousType) switch (_settings.PreviousType)
{ {
default: default:
case PreviousType.LastSearch:
Previous_LastSearchMenuItem.Checked = true;
break;
case PreviousType.LastFrame: case PreviousType.LastFrame:
PreviousFrameMenuItem.Checked = true; PreviousFrameMenuItem.Checked = true;
break; break;
@ -1143,11 +1134,6 @@ namespace BizHawk.Client.EmuHawk
SetPreviousType(PreviousType.LastFrame); SetPreviousType(PreviousType.LastFrame);
} }
private void Previous_LastSearchMenuItem_Click(object sender, EventArgs e)
{
SetPreviousType(PreviousType.LastSearch);
}
private void Previous_OriginalMenuItem_Click(object sender, EventArgs e) private void Previous_OriginalMenuItem_Click(object sender, EventArgs e)
{ {
SetPreviousType(PreviousType.Original); SetPreviousType(PreviousType.Original);