Remove Previous Value = last change option, also remove temporary New Ram Search menu item

This commit is contained in:
adelikat 2013-09-29 21:15:47 +00:00
parent 8619636bdb
commit 6fa73d0de5
6 changed files with 11 additions and 55 deletions

View File

@ -342,7 +342,6 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.newRamSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -1809,8 +1808,7 @@
this.luaConsoleToolStripMenuItem, this.luaConsoleToolStripMenuItem,
this.cheatsToolStripMenuItem, this.cheatsToolStripMenuItem,
this.toolStripSeparator29, this.toolStripSeparator29,
this.createDualGBXMLToolStripMenuItem, this.createDualGBXMLToolStripMenuItem});
this.newRamSearchToolStripMenuItem});
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19);
this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.Text = "&Tools";
@ -2979,13 +2977,6 @@
this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
// //
// newRamSearchToolStripMenuItem
//
this.newRamSearchToolStripMenuItem.Name = "newRamSearchToolStripMenuItem";
this.newRamSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.newRamSearchToolStripMenuItem.Text = "New Ram Search";
this.newRamSearchToolStripMenuItem.Click += new System.EventHandler(this.newRamSearchToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3339,8 +3330,7 @@
private System.Windows.Forms.ToolStripMenuItem rewindOptionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rewindOptionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem rewindToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rewindToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem firmwaresToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem firmwaresToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem loadTIFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadTIFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem newRamSearchToolStripMenuItem;
} }
} }

View File

@ -4176,10 +4176,5 @@ namespace BizHawk.MultiClient
RamWatch1.Focus(); RamWatch1.Focus();
} }
} }
private void newRamSearchToolStripMenuItem_Click(object sender, EventArgs e)
{
new RamSearch().Show();
}
} }
} }

View File

@ -26,10 +26,6 @@ namespace BizHawk.MultiClient
private int CurrentMemoryDomain; //Main memory by default private int CurrentMemoryDomain; //Main memory by default
private Lua currThread; private Lua currThread;
//private List<NamedLuaFunction> on_savestate_save_events = new List<NamedLuaFunction>();
//private List<NamedLuaFunction> on_savestate_load_events = new List<NamedLuaFunction>();
//private List<NamedLuaFunction> on_framestart_events = new List<NamedLuaFunction>();
//private List<NamedLuaFunction> on_frameend_events = new List<NamedLuaFunction>();
private LuaFunctionCollection lua_functions = new LuaFunctionCollection(); private LuaFunctionCollection lua_functions = new LuaFunctionCollection();
private readonly Dictionary<Color, SolidBrush> SolidBrushes = new Dictionary<Color, SolidBrush>(); private readonly Dictionary<Color, SolidBrush> SolidBrushes = new Dictionary<Color, SolidBrush>();

View File

@ -79,7 +79,6 @@
this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Previous_LastSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.Previous_LastSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Previous_LastChangeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Previous_OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.Previous_OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BigEndianMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.BigEndianMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -455,9 +454,9 @@
this.sizeToolStripMenuItem, this.sizeToolStripMenuItem,
this.CheckMisalignedMenuItem, this.CheckMisalignedMenuItem,
this.toolStripSeparator8, this.toolStripSeparator8,
this.BigEndianMenuItem,
this.DisplayTypeSubMenu, this.DisplayTypeSubMenu,
this.DefinePreviousValueSubMenu, this.DefinePreviousValueSubMenu});
this.BigEndianMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.settingsToolStripMenuItem.Text = "&Settings"; this.settingsToolStripMenuItem.Text = "&Settings";
@ -562,9 +561,8 @@
// DefinePreviousValueSubMenu // DefinePreviousValueSubMenu
// //
this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PreviousFrameMenuItem,
this.Previous_LastSearchMenuItem, this.Previous_LastSearchMenuItem,
this.Previous_LastChangeMenuItem, this.PreviousFrameMenuItem,
this.Previous_OriginalMenuItem}); this.Previous_OriginalMenuItem});
this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu";
this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(188, 22); this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(188, 22);
@ -585,13 +583,6 @@
this.Previous_LastSearchMenuItem.Text = "Last &Search"; this.Previous_LastSearchMenuItem.Text = "Last &Search";
this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click); this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click);
// //
// Previous_LastChangeMenuItem
//
this.Previous_LastChangeMenuItem.Name = "Previous_LastChangeMenuItem";
this.Previous_LastChangeMenuItem.Size = new System.Drawing.Size(155, 22);
this.Previous_LastChangeMenuItem.Text = "Last &Change";
this.Previous_LastChangeMenuItem.Click += new System.EventHandler(this.Previous_LastChangeMenuItem_Click);
//
// Previous_OriginalMenuItem // Previous_OriginalMenuItem
// //
this.Previous_OriginalMenuItem.Name = "Previous_OriginalMenuItem"; this.Previous_OriginalMenuItem.Name = "Previous_OriginalMenuItem";
@ -1477,7 +1468,6 @@
private System.Windows.Forms.ToolStripMenuItem DefinePreviousValueSubMenu; private System.Windows.Forms.ToolStripMenuItem DefinePreviousValueSubMenu;
private System.Windows.Forms.ToolStripMenuItem PreviousFrameMenuItem; private System.Windows.Forms.ToolStripMenuItem PreviousFrameMenuItem;
private System.Windows.Forms.ToolStripMenuItem Previous_LastSearchMenuItem; private System.Windows.Forms.ToolStripMenuItem Previous_LastSearchMenuItem;
private System.Windows.Forms.ToolStripMenuItem Previous_LastChangeMenuItem;
private System.Windows.Forms.ToolStripMenuItem Previous_OriginalMenuItem; private System.Windows.Forms.ToolStripMenuItem 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

@ -880,7 +880,6 @@ namespace BizHawk.MultiClient
private void DefinePreviousValueSubMenu_DropDownOpened(object sender, EventArgs e) private void DefinePreviousValueSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
Previous_LastSearchMenuItem.Checked = false; Previous_LastSearchMenuItem.Checked = false;
Previous_LastChangeMenuItem.Checked = false;
PreviousFrameMenuItem.Checked = false; PreviousFrameMenuItem.Checked = false;
Previous_OriginalMenuItem.Checked = false; Previous_OriginalMenuItem.Checked = false;
@ -890,9 +889,6 @@ namespace BizHawk.MultiClient
case Watch.PreviousType.LastSearch: case Watch.PreviousType.LastSearch:
Previous_LastSearchMenuItem.Checked = true; Previous_LastSearchMenuItem.Checked = true;
break; break;
case Watch.PreviousType.LastChange:
Previous_LastChangeMenuItem.Checked = true;
break;
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
PreviousFrameMenuItem.Checked = true; PreviousFrameMenuItem.Checked = true;
break; break;
@ -903,12 +899,10 @@ namespace BizHawk.MultiClient
if (Settings.Mode == RamSearchEngine.Settings.SearchMode.Fast) if (Settings.Mode == RamSearchEngine.Settings.SearchMode.Fast)
{ {
Previous_LastChangeMenuItem.Enabled = false;
PreviousFrameMenuItem.Enabled = false; PreviousFrameMenuItem.Enabled = false;
} }
else else
{ {
Previous_LastChangeMenuItem.Enabled = true;
PreviousFrameMenuItem.Enabled = true; PreviousFrameMenuItem.Enabled = true;
} }
} }
@ -954,11 +948,6 @@ namespace BizHawk.MultiClient
SetPreviousStype(Watch.PreviousType.LastSearch); SetPreviousStype(Watch.PreviousType.LastSearch);
} }
private void Previous_LastChangeMenuItem_Click(object sender, EventArgs e)
{
SetPreviousStype(Watch.PreviousType.LastChange);
}
private void Previous_OriginalMenuItem_Click(object sender, EventArgs e) private void Previous_OriginalMenuItem_Click(object sender, EventArgs e)
{ {
SetPreviousStype(Watch.PreviousType.Original); SetPreviousStype(Watch.PreviousType.Original);

View File

@ -268,9 +268,14 @@ namespace BizHawk.MultiClient
public void SetPreviousType(Watch.PreviousType type) public void SetPreviousType(Watch.PreviousType type)
{ {
if (type == Watch.PreviousType.LastChange)
{
throw new InvalidOperationException();
}
if (_settings.Mode == Settings.SearchMode.Fast) if (_settings.Mode == Settings.SearchMode.Fast)
{ {
if (type == Watch.PreviousType.LastFrame || type == Watch.PreviousType.LastChange) if (type == Watch.PreviousType.LastFrame)
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
@ -831,9 +836,6 @@ namespace BizHawk.MultiClient
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = value;
break; break;
case Watch.PreviousType.LastChange:
//TODO: this feature requires yet another variable, ugh
break;
} }
} }
@ -885,9 +887,6 @@ namespace BizHawk.MultiClient
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = value;
break; break;
case Watch.PreviousType.LastChange:
//TODO: this feature requires yet another variable, ugh
break;
} }
} }
@ -939,9 +938,6 @@ namespace BizHawk.MultiClient
case Watch.PreviousType.LastFrame: case Watch.PreviousType.LastFrame:
_previous = value; _previous = value;
break; break;
case Watch.PreviousType.LastChange:
//TODO: this feature requires yet another variable, ugh
break;
} }
} }