From bb5988d1b7df9014fadde7bc9ef48ca00de7beef Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Wed, 23 Feb 2011 05:00:15 +0000 Subject: [PATCH] Ram Search - specific values can be negative if signed Data Type is selected --- BizHawk.MultiClient/tools/RamSearch.cs | 12 ++++++------ BizHawk.Util/InputValidate.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 72cb3cfec0..005a0df393 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -697,7 +697,7 @@ namespace BizHawk.MultiClient private bool DoSpecificValue() { int value = GetSpecificValue(); - if (value < 0) + if (value < -99999999) { MessageBox.Show("Missing or invalid value", "Invalid value", MessageBoxButtons.OK, MessageBoxIcon.Error); SpecificValueBox.Focus(); @@ -763,24 +763,24 @@ namespace BizHawk.MultiClient private int GetSpecificValue() { - if (SpecificValueBox.Text == "") return 0; + if (SpecificValueBox.Text == "" || SpecificValueBox.Text == "-") return 0; bool i = false; switch (GetDataType()) { case asigned.UNSIGNED: i = InputValidate.IsValidUnsignedNumber(SpecificValueBox.Text); - if (!i) return -1; + if (!i) return -99999999; return int.Parse(SpecificValueBox.Text); case asigned.SIGNED: i = InputValidate.IsValidSignedNumber(SpecificValueBox.Text); - if (!i) return -1; + if (!i) return -99999999; return int.Parse(SpecificValueBox.Text); case asigned.HEX: i = InputValidate.IsValidHexNumber(SpecificValueBox.Text); - if (!i) return -1; + if (!i) return -99999999; return int.Parse(SpecificValueBox.Text, NumberStyles.HexNumber); } - return -1; + return -99999999; //What are the odds someone wants to search for this value? } private int GetSpecificAddress() diff --git a/BizHawk.Util/InputValidate.cs b/BizHawk.Util/InputValidate.cs index c455d22e06..8c02ae82b0 100644 --- a/BizHawk.Util/InputValidate.cs +++ b/BizHawk.Util/InputValidate.cs @@ -68,7 +68,7 @@ namespace BizHawk public static bool IsValidSignedNumber(char c) { - if (c == 47) return true; + if (c == 45) return true; if (c < 47 || c > 58) return false;