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

Ram Watch - oops, fixed last commit better

This commit is contained in:
adelikat 2012-08-15 01:14:25 +00:00
parent 0d867101bf
commit 0ed2ec1be9
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -1744,7 +1744,7 @@ namespace BizHawk.MultiClient
public void client_openramwatch() public void client_openramwatch()
{ {
Global.MainForm.LoadRamWatch(); Global.MainForm.LoadRamWatch(true);
} }
public void client_openramsearch() public void client_openramsearch()

2
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -232,7 +232,7 @@ namespace BizHawk.MultiClient
private void RAMWatchToolStripMenuItem_Click(object sender, EventArgs e) private void RAMWatchToolStripMenuItem_Click(object sender, EventArgs e)
{ {
LoadRamWatch(); LoadRamWatch(true);
} }
private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e) private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e)

17
BizHawk.MultiClient/MainForm.cs
View File

@ -249,7 +249,14 @@ namespace BizHawk.MultiClient
if (Global.Config.AutoLoadRamWatch) if (Global.Config.AutoLoadRamWatch)
{ {
LoadRamWatch(); if (Global.Config.DisplayRamWatch)
{
LoadRamWatch(false);
}
else
{
LoadRamWatch(true);
}
} }
if (Global.Config.AutoLoadRamSearch) if (Global.Config.AutoLoadRamSearch)
LoadRamSearch(); LoadRamSearch();
@ -920,7 +927,7 @@ namespace BizHawk.MultiClient
} }
else if (Path.GetExtension(filePaths[0]).ToUpper() == ".WCH") else if (Path.GetExtension(filePaths[0]).ToUpper() == ".WCH")
{ {
LoadRamWatch(); LoadRamWatch(true);
RamWatch1.LoadWatchFile(filePaths[0], false); RamWatch1.LoadWatchFile(filePaths[0], false);
RamWatch1.DisplayWatchList(); RamWatch1.DisplayWatchList();
} }
@ -1689,7 +1696,7 @@ namespace BizHawk.MultiClient
case "Load Named State": LoadStateAs(); break; case "Load Named State": LoadStateAs(); break;
case "Previous Slot": PreviousSlot(); break; case "Previous Slot": PreviousSlot(); break;
case "Next Slot": NextSlot(); break; case "Next Slot": NextSlot(); break;
case "Ram Watch": LoadRamWatch(); break; case "Ram Watch": LoadRamWatch(true); break;
case "Ram Search": LoadRamSearch(); break; case "Ram Search": LoadRamSearch(); break;
case "Ram Poke": case "Ram Poke":
{ {
@ -2703,7 +2710,7 @@ namespace BizHawk.MultiClient
Global.OSD.AddMessage("Movie read+write mode"); Global.OSD.AddMessage("Movie read+write mode");
} }
public void LoadRamWatch() public void LoadRamWatch(bool load_dialog)
{ {
if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed) if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed)
{ {
@ -2712,7 +2719,7 @@ namespace BizHawk.MultiClient
{ {
RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0)); RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0));
} }
if (!Global.Config.DisplayRamWatch) if (load_dialog)
{ {
RamWatch1.Show(); RamWatch1.Show();
} }

2
BizHawk.MultiClient/tools/HexEditor.cs
View File

@ -535,7 +535,7 @@ namespace BizHawk.MultiClient
if (address >= 0 || SecondaryHighlightedAddresses.Count > 0) if (address >= 0 || SecondaryHighlightedAddresses.Count > 0)
{ {
Global.MainForm.LoadRamWatch(); Global.MainForm.LoadRamWatch(true);
} }
if (address >= 0) if (address >= 0)

4
BizHawk.MultiClient/tools/RamSearch.cs
View File

@ -302,9 +302,11 @@ namespace BizHawk.MultiClient
if (indexes.Count > 0) if (indexes.Count > 0)
{ {
Global.MainForm.LoadRamWatch(); Global.MainForm.LoadRamWatch(true);
for (int x = 0; x < indexes.Count; x++) for (int x = 0; x < indexes.Count; x++)
{
Global.MainForm.RamWatch1.AddWatch(searchList[indexes[x]]); Global.MainForm.RamWatch1.AddWatch(searchList[indexes[x]]);
}
} }
} }

2
BizHawk.MultiClient/tools/ToolBox.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.MultiClient
private void toolStripButton2_Click(object sender, EventArgs e) private void toolStripButton2_Click(object sender, EventArgs e)
{ {
Global.MainForm.LoadRamWatch(); Global.MainForm.LoadRamWatch(true);
} }
private void toolStripButton3_Click(object sender, EventArgs e) private void toolStripButton3_Click(object sender, EventArgs e)