ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mirror cleanup from cf4dd6770 onto the Lua APIs

This commit is contained in:
YoshiRulz 2019-11-16 16:52:32 +10:00
parent fab882b7a5
commit 27b2d1b6ad
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
5 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
View File

@ -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

6
BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
View File

@ -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

8
BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs
View File

@ -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
{

9
BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs
View File

@ -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( );")]

8
BizHawk.Client.Common/lua/LuaMemoryBase.cs
View File

@ -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
{