Tool hotkeys - remove a bunch of now unnecessary checks

This commit is contained in:
adelikat 2014-12-14 01:30:38 +00:00
parent 106b9d4848
commit ce4c3a4ca6
1 changed files with 10 additions and 40 deletions

View File

@ -294,16 +294,10 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.LoadRamWatch(true); GlobalWin.Tools.LoadRamWatch(true);
break; break;
case "Ram Search": case "Ram Search":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.Load<RamSearch>();
{
GlobalWin.Tools.Load<RamSearch>();
}
break; break;
case "Hex Editor": case "Hex Editor":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.Load<HexEditor>();
{
GlobalWin.Tools.Load<HexEditor>();
}
break; break;
case "Trace Logger": case "Trace Logger":
GlobalWin.Tools.LoadTraceLogger(); GlobalWin.Tools.LoadTraceLogger();
@ -312,16 +306,10 @@ namespace BizHawk.Client.EmuHawk
OpenLuaConsole(); OpenLuaConsole();
break; break;
case "Cheats": case "Cheats":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.Load<Cheats>();
{
GlobalWin.Tools.Load<Cheats>();
}
break; break;
case "TAStudio": case "TAStudio":
if (Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput()) GlobalWin.Tools.Load<TAStudio>();
{
GlobalWin.Tools.Load<TAStudio>();
}
break; break;
case "ToolBox": case "ToolBox":
GlobalWin.Tools.Load<ToolBox>(); GlobalWin.Tools.Load<ToolBox>();
@ -332,40 +320,22 @@ namespace BizHawk.Client.EmuHawk
// Ram Search // Ram Search
case "Do Search": case "Do Search":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.DoSearch();
{
GlobalWin.Tools.RamSearch.DoSearch();
}
break; break;
case "New Search": case "New Search":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.NewSearch();
{
GlobalWin.Tools.RamSearch.NewSearch();
}
break; break;
case "Previous Compare To": case "Previous Compare To":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true);
{
GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true);
}
break; break;
case "Next Compare To": case "Next Compare To":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.NextCompareTo();
{
GlobalWin.Tools.RamSearch.NextCompareTo();
}
break; break;
case "Previous Operator": case "Previous Operator":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.NextOperator(reverse: true);
{
GlobalWin.Tools.RamSearch.NextOperator(reverse: true);
}
break; break;
case "Next Operator": case "Next Operator":
if (Global.Emulator.HasMemoryDomains()) GlobalWin.Tools.RamSearch.NextOperator();
{
GlobalWin.Tools.RamSearch.NextOperator();
}
break; break;
// SNES // SNES