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

Fix Ram Watch on screen display that I broke in the last ram watch related commit

This commit is contained in:
adelikat 2014-04-26 14:51:33 +00:00
parent edf2e2e4a7
commit f3766249bf
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
View File

@ -145,26 +145,6 @@ namespace BizHawk.Client.EmuHawk
GameGenieCode.Text = new NESGameGenieEncoder(_address.Value, _value.Value, _compare).Encode();
}
private void AddCheatClick()
{
if (!string.IsNullOrWhiteSpace(AddressBox.Text) && !string.IsNullOrWhiteSpace(ValueBox.Text))
{
var watch = Watch.GenerateWatch(
Global.Emulator.MemoryDomains["System Bus"],
AddressBox.ToRawInt().Value,
Watch.WatchSize.Byte,
Watch.DisplayType.Hex,
GameGenieCode.Text,
false);
Global.CheatList.Add(new Cheat(
watch,
ValueBox.ToRawInt().Value,
CompareBox.ToRawInt()
));
}
}
private void RefreshFloatingWindowControl()
{
Owner = Global.Config.NesGGSettings.FloatingWindow ? null : GlobalWin.MainForm;
@ -242,7 +222,22 @@ namespace BizHawk.Client.EmuHawk
private void AddCheat_Click(object sender, EventArgs e)
{
AddCheatClick();
if (!string.IsNullOrWhiteSpace(AddressBox.Text) && !string.IsNullOrWhiteSpace(ValueBox.Text))
{
var watch = Watch.GenerateWatch(
Global.Emulator.MemoryDomains["System Bus"],
AddressBox.ToRawInt().Value,
Watch.WatchSize.Byte,
Watch.DisplayType.Hex,
GameGenieCode.Text,
false);
Global.CheatList.Add(new Cheat(
watch,
ValueBox.ToRawInt().Value,
CompareBox.ToRawInt()
));
}
}
private void GameGenieCode_KeyDown(object sender, KeyEventArgs e)
@ -251,7 +246,7 @@ namespace BizHawk.Client.EmuHawk
{
if (AddCheat.Enabled)
{
AddCheatClick();
AddCheat_Click(null, null);
}
}
}

6
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -102,7 +102,11 @@ namespace BizHawk.Client.EmuHawk
var afterList = _tools.Where(x => !x.UpdateBefore);
foreach (var tool in afterList.Where(tool => !tool.IsDisposed))
{
tool.UpdateValues();
if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed
{
tool.UpdateValues();
}
}
}