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

Fix Ram Poke for Ram Watch/Search dialogs

This commit is contained in:
adelikat 2012-06-02 21:07:29 +00:00
parent 6578371bca
commit a74fbb84fe
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,14 @@ namespace BizHawk.MultiClient
public void SetWatchObject(Watch w, MemoryDomain d) public void SetWatchObject(Watch w, MemoryDomain d)
{ {
watch = w; PopulateMemoryDomainComboBox();
watch = new Watch(w);
domain = d; domain = d;
} }
private void RamPoke_Load(object sender, EventArgs e) private void RamPoke_Load(object sender, EventArgs e)
{ {
if (watch.address == 0)
PopulateMemoryDomainComboBox(); PopulateMemoryDomainComboBox();
SetTypeRadio(watch.type); SetTypeRadio(watch.type);
SetSignedRadio(watch.signed); SetSignedRadio(watch.signed);

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

@ -471,10 +471,13 @@ namespace BizHawk.MultiClient
RamPoke p = new RamPoke(); RamPoke p = new RamPoke();
Global.Sound.StartSound(); Global.Sound.StartSound();
int x = indexes[0];
Watch bob = searchList[indexes[0]];
if (indexes.Count > 0) if (indexes.Count > 0)
p.SetWatchObject(searchList[indexes[0]], Domain); p.SetWatchObject(searchList[indexes[0]], Domain);
p.location = GetPromptPoint(); p.location = GetPromptPoint();
p.ShowDialog(); p.ShowDialog();
UpdateValues();
} }
private void PoketoolStripButton1_Click(object sender, EventArgs e) private void PoketoolStripButton1_Click(object sender, EventArgs e)

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

@ -927,11 +927,13 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices; ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices;
Global.Sound.StopSound(); Global.Sound.StopSound();
RamPoke p = new RamPoke(); RamPoke p = new RamPoke();
Global.Sound.StartSound();
if (indexes.Count > 0) if (indexes.Count > 0)
p.SetWatchObject(watchList[indexes[0]], Domain); p.SetWatchObject(watchList[indexes[0]], Domain);
p.location = GetPromptPoint(); p.location = GetPromptPoint();
p.ShowDialog(); p.ShowDialog();
Global.Sound.StartSound(); UpdateValues();
} }
private void pokeAddressToolStripMenuItem_Click(object sender, EventArgs e) private void pokeAddressToolStripMenuItem_Click(object sender, EventArgs e)