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

-Fixed GetSpecificValue(), which means that signed searching works now. 

-Upon changing data type, the contents of the specific value box converts accordingly.
This commit is contained in:
brandman211 2012-06-07 23:17:22 +00:00
parent cff7ba6d24
commit 67a9f86c78
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,31 +616,10 @@ namespace BizHawk.MultiClient
} }
if (column == 2) if (column == 2)
{ {
if (searchList[index].signed == asigned.UNSIGNED) if (Global.Config.RamSearchPreviousAs == 2) //If prev frame
{ text = searchList[index].PrevToString();
if (Global.Config.RamSearchPreviousAs == 2) //If prev frame else
text = searchList[index].prev.ToString(); text = prevList[index].ValueToString();
else
text = prevList[index].value.ToString();
}
else if (searchList[index].signed == asigned.SIGNED)
{
if (Global.Config.RamSearchPreviousAs == 2) //If prev frame
text = ((sbyte)searchList[index].prev).ToString();
else
text = ((sbyte)prevList[index].value).ToString();
}
else if (searchList[index].signed == asigned.HEX)
{
if (Global.Config.RamSearchPreviousAs == 2) //If prev frame
{
text = searchList[index].PrevToString();
}
else
{
text = prevList[index].ValueToString();
}
}
} }
if (column == 3) if (column == 3)
{ {
@ -914,7 +893,20 @@ namespace BizHawk.MultiClient
case asigned.SIGNED: case asigned.SIGNED:
i = InputValidate.IsValidSignedNumber(SpecificValueBox.Text); i = InputValidate.IsValidSignedNumber(SpecificValueBox.Text);
if (!i) return -99999999; if (!i) return -99999999;
return (int)Int64.Parse(SpecificValueBox.Text); int real = (int)Int64.Parse(SpecificValueBox.Text);
switch (GetDataSize())
{
case atype.BYTE:
real = (int)(byte)real;
break;
case atype.WORD:
real = (int)(ushort)real;
break;
case atype.DWORD:
real = (int)(uint)real;
break;
}
return real;
case asigned.HEX: case asigned.HEX:
i = InputValidate.IsValidHexNumber(SpecificValueBox.Text); i = InputValidate.IsValidHexNumber(SpecificValueBox.Text);
if (!i) return -99999999; if (!i) return -99999999;
@ -1100,6 +1092,10 @@ namespace BizHawk.MultiClient
private void signedToolStripMenuItem_Click(object sender, EventArgs e) private void signedToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Watch specificValue = new Watch();
specificValue.value = GetSpecificValue();
specificValue.signed = asigned.SIGNED;
SpecificValueBox.Text = specificValue.ValueToString();
unsignedToolStripMenuItem.Checked = false; unsignedToolStripMenuItem.Checked = false;
signedToolStripMenuItem.Checked = true; signedToolStripMenuItem.Checked = true;
hexadecimalToolStripMenuItem.Checked = false; hexadecimalToolStripMenuItem.Checked = false;
@ -1110,6 +1106,10 @@ namespace BizHawk.MultiClient
private void unsignedToolStripMenuItem_Click(object sender, EventArgs e) private void unsignedToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Watch specificValue = new Watch();
specificValue.value = GetSpecificValue();
specificValue.signed = asigned.UNSIGNED;
SpecificValueBox.Text = specificValue.ValueToString();
unsignedToolStripMenuItem.Checked = true; unsignedToolStripMenuItem.Checked = true;
signedToolStripMenuItem.Checked = false; signedToolStripMenuItem.Checked = false;
hexadecimalToolStripMenuItem.Checked = false; hexadecimalToolStripMenuItem.Checked = false;
@ -1120,6 +1120,10 @@ namespace BizHawk.MultiClient
private void hexadecimalToolStripMenuItem_Click(object sender, EventArgs e) private void hexadecimalToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Watch specificValue = new Watch();
specificValue.value = GetSpecificValue();
specificValue.signed = asigned.HEX;
SpecificValueBox.Text = specificValue.ValueToString();
unsignedToolStripMenuItem.Checked = false; unsignedToolStripMenuItem.Checked = false;
signedToolStripMenuItem.Checked = false; signedToolStripMenuItem.Checked = false;
hexadecimalToolStripMenuItem.Checked = true; hexadecimalToolStripMenuItem.Checked = true;

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

@ -280,7 +280,7 @@ namespace BizHawk.MultiClient
default: default:
case asigned.UNSIGNED: case asigned.UNSIGNED:
switch (type) switch (type)
{ {
default: default:
case atype.BYTE: case atype.BYTE:
return ((byte)value).ToString(); return ((byte)value).ToString();
@ -288,7 +288,7 @@ namespace BizHawk.MultiClient
return ((ushort)value).ToString(); return ((ushort)value).ToString();
case atype.DWORD: case atype.DWORD:
return ((uint)value).ToString(); return ((uint)value).ToString();
} }
} }
} }
} }