diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs index b80c6ac99f..6c8ebe32be 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs @@ -18,28 +18,28 @@ namespace BizHawk.Client.Common public LuaTable Get(int? controller = null) { var buttons = Lua.NewTable(); - var adaptor = Global.AutofireStickyXORAdapter; - foreach (var button in adaptor.Source.Definition.BoolButtons) + var adapter = Global.AutofireStickyXORAdapter; + foreach (var button in adapter.Source.Definition.BoolButtons) { if (!controller.HasValue) { - buttons[button] = adaptor.IsPressed(button); + buttons[button] = adapter.IsPressed(button); } else if (button.Length >= 3 && button.Substring(0, 2) == $"P{controller}") { - buttons[button.Substring(3)] = adaptor.IsPressed($"P{controller} {button.Substring(3)}"); + buttons[button.Substring(3)] = adapter.IsPressed($"P{controller} {button.Substring(3)}"); } } - foreach (var button in adaptor.Source.Definition.FloatControls) + foreach (var button in adapter.Source.Definition.FloatControls) { if (controller == null) { - buttons[button] = adaptor.GetFloat(button); + buttons[button] = adapter.GetFloat(button); } else if (button.Length >= 3 && button.Substring(0, 2) == $"P{controller}") { - buttons[button.Substring(3)] = adaptor.GetFloat($"P{controller} {button.Substring(3)}"); + buttons[button.Substring(3)] = adapter.GetFloat($"P{controller} {button.Substring(3)}"); } } @@ -167,21 +167,13 @@ namespace BizHawk.Client.Common if (!string.IsNullOrWhiteSpace(theValueStr)) { - float f; - if (float.TryParse(theValueStr, out f)) + if (float.TryParse(theValueStr, out var f)) { theValue = f; } } - if (controller == null) - { - Global.StickyXORAdapter.SetFloat(name.ToString(), theValue); - } - else - { - Global.StickyXORAdapter.SetFloat($"P{controller} {name}", theValue); - } + Global.StickyXORAdapter.SetFloat(controller == null ? name.ToString() : $"P{controller} {name}", theValue); } } catch diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs index 71395b4737..168920035d 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs @@ -140,10 +140,8 @@ namespace BizHawk.Client.Common data[i] = d.PeekByte(addr + i); } - using (var hasher = System.Security.Cryptography.SHA256.Create()) - { - return hasher.ComputeHash(data).BytesToHexString(); - } + using var hasher = System.Security.Cryptography.SHA256.Create(); + return hasher.ComputeHash(data).BytesToHexString(); } #endregion diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs index b8a52a6122..8ebb3f5875 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs @@ -45,11 +45,9 @@ namespace BizHawk.Client.Common { var state = _memorySavestates[guid]; - using (var ms = new MemoryStream(state)) - using (var br = new BinaryReader(ms)) - { - StatableCore.LoadStateBinary(br); - } + using var ms = new MemoryStream(state); + using var br = new BinaryReader(ms); + StatableCore.LoadStateBinary(br); } catch { diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs index a3029b34a8..088a19de8e 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs @@ -38,12 +38,9 @@ namespace BizHawk.Client.EmuHawk [LuaMethod("get", "gets the data with the given key, if the key does not exist it will return nil")] public object Get(string key) { - if (Global.UserBag.ContainsKey(key)) - { - return Global.UserBag[key]; - } - - return null; + return Global.UserBag.ContainsKey(key) + ? Global.UserBag[key] + : null; } [LuaMethodExample("userdata.clear( );")] diff --git a/BizHawk.Client.Common/lua/LuaMemoryBase.cs b/BizHawk.Client.Common/lua/LuaMemoryBase.cs index 1cd965d288..fde9c90cfd 100644 --- a/BizHawk.Client.Common/lua/LuaMemoryBase.cs +++ b/BizHawk.Client.Common/lua/LuaMemoryBase.cs @@ -216,12 +216,12 @@ namespace BizHawk.Client.Common } } - protected float ReadFloat(int addr, bool bigendian, string domain = null) + protected float ReadFloat(int addr, bool bigEndian, string domain = null) { var d = string.IsNullOrEmpty(domain) ? Domain : DomainList[VerifyMemoryDomain(domain)]; if (addr < d.Size) { - var val = d.PeekUint(addr, bigendian); + var val = d.PeekUint(addr, bigEndian); var bytes = BitConverter.GetBytes(val); return BitConverter.ToSingle(bytes, 0); } @@ -231,7 +231,7 @@ namespace BizHawk.Client.Common return 0; } - protected void WriteFloat(int addr, double value, bool bigendian, string domain = null) + protected void WriteFloat(int addr, double value, bool bigEndian, string domain = null) { var d = string.IsNullOrEmpty(domain) ? Domain : DomainList[VerifyMemoryDomain(domain)]; if (d.CanPoke()) @@ -241,7 +241,7 @@ namespace BizHawk.Client.Common var dv = (float)value; var bytes = BitConverter.GetBytes(dv); var v = BitConverter.ToUInt32(bytes, 0); - d.PokeUint(addr, v, bigendian); + d.PokeUint(addr, v, bigEndian); } else {