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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -342,7 +342,6 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.newRamSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
@ -1809,8 +1808,7 @@
this.luaConsoleToolStripMenuItem,
this.cheatsToolStripMenuItem,
this.toolStripSeparator29,
this.createDualGBXMLToolStripMenuItem,
this.newRamSearchToolStripMenuItem});
this.createDualGBXMLToolStripMenuItem});
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19);
this.toolsToolStripMenuItem.Text = "&Tools";
@ -2979,13 +2977,6 @@
this.cmiShowMenu.Text = "Show Menu";
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3339,8 +3330,7 @@
private System.Windows.Forms.ToolStripMenuItem rewindOptionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem rewindToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem firmwaresToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem loadTIFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem newRamSearchToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem loadTIFileToolStripMenuItem;
}
}

5
BizHawk.MultiClient/MainForm.cs
View File

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

4
BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
View File

@ -26,10 +26,6 @@ namespace BizHawk.MultiClient
private int CurrentMemoryDomain; //Main memory by default
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 readonly Dictionary<Color, SolidBrush> SolidBrushes = new Dictionary<Color, SolidBrush>();

16
BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs generated
View File

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

11
BizHawk.MultiClient/tools/Watch/RamSearch.cs
View File

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

16
BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs
View File

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