From 5459c92a4d61f33ff63b883e696177eb037b1b99 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 18 Jun 2018 09:00:59 +0100 Subject: [PATCH] ZXHawk: Hard/Soft client reset options implemented and working - #1158 --- .../Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs | 4 ++-- .../Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs index 6aab944eb7..b64fa125eb 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs @@ -24,8 +24,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum string EjectDisk = "Eject Current Disk"; string DiskStatus = "Get Disk Status"; - string HardResetStr = "Hard Reset"; - string SoftResetStr = "Soft Reset"; + string HardResetStr = "Power"; + string SoftResetStr = "Reset"; bool pressed_Play = false; bool pressed_Stop = false; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs index b44e1af74c..749fc03830 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs @@ -84,8 +84,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // Power functions List power = new List { - // Tape functions - "Soft Reset", "Hard Reset" + // Power functions + "Reset", "Power" }; foreach (var s in power)