From f19333dd111335f882f8de81b7b132244e2a978b Mon Sep 17 00:00:00 2001 From: Adam Sturge Date: Fri, 5 Feb 2016 20:33:21 -0800 Subject: [PATCH] Prettied up display of comparison type in cheats table --- BizHawk.Client.Common/tools/Cheat.cs | 10 +++++++++- BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs | 2 +- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 13 ++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.Common/tools/Cheat.cs b/BizHawk.Client.Common/tools/Cheat.cs index f73e9b4afe..4cee5a343b 100644 --- a/BizHawk.Client.Common/tools/Cheat.cs +++ b/BizHawk.Client.Common/tools/Cheat.cs @@ -6,7 +6,15 @@ namespace BizHawk.Client.Common { public class Cheat { - public enum COMPARISONTYPE { EQUAL, GREATER_THAN, GREATER_THAN_OR_EQUAL, LESS_THAN, LESS_THAN_OR_EQUAL, NOT_EQUAL}; + public enum COMPARISONTYPE + { + EQUAL, + GREATER_THAN, + GREATER_THAN_OR_EQUAL, + LESS_THAN, + LESS_THAN_OR_EQUAL, + NOT_EQUAL + }; private readonly Watch _watch; private int? _compare; diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index 56c0907099..0d421ec904 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -326,7 +326,7 @@ namespace BizHawk.Client.EmuHawk } else { - switch (CompareTypeDropDown.SelectedText) + switch (CompareTypeDropDown.SelectedItem.ToString()) { case "=" : comparisonType = Cheat.COMPARISONTYPE.EQUAL; break; case ">" : comparisonType = Cheat.COMPARISONTYPE.GREATER_THAN; break; diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index f123017f24..b735031805 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -10,6 +10,7 @@ using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.WinFormExtensions; +using System.Diagnostics; namespace BizHawk.Client.EmuHawk { @@ -264,7 +265,17 @@ namespace BizHawk.Client.EmuHawk text = Watch.DisplayTypeToString(Global.CheatList[index].Type); break; case COMPARISONTYPE: - text = Global.CheatList[index].ComparisonType.ToString(); + switch (Global.CheatList[index].ComparisonType) + { + case Cheat.COMPARISONTYPE.EQUAL : text = "="; break; + case Cheat.COMPARISONTYPE.GREATER_THAN : text = ">"; break; + case Cheat.COMPARISONTYPE.GREATER_THAN_OR_EQUAL : text = ">="; break; + case Cheat.COMPARISONTYPE.LESS_THAN : text = "<"; break; + case Cheat.COMPARISONTYPE.LESS_THAN_OR_EQUAL : text = "<="; break; + case Cheat.COMPARISONTYPE.NOT_EQUAL : text = "!="; break; + default : break; + } + break; } }