From 195846f2f31e3d4f5b3b0b3c1729dda75d004c78 Mon Sep 17 00:00:00 2001 From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:54:42 -0700 Subject: [PATCH] cleanup c# side melon code --- src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs | 1 - .../Consoles/Nintendo/NDS/MelonDS.ISettable.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs | 1 - 3 files changed, 3 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs index 31d45fb9b2..0a813055fd 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs @@ -33,7 +33,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS [StructLayout(LayoutKind.Sequential)] public new class FrameInfo : LibWaterboxCore.FrameInfo { - public long Time; public Buttons Keys; public byte TouchX; public byte TouchY; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs index a67c587f76..e60e4ec33f 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs @@ -7,7 +7,6 @@ using System.Text; using Newtonsoft.Json; using BizHawk.Common; -using BizHawk.Common.CollectionExtensions; using BizHawk.Emulation.Common; // ReSharper disable SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs index f7e417f9e7..8c15ef1169 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs @@ -466,7 +466,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS return new LibMelonDS.FrameInfo { - Time = GetRtcTime(!DeterministicEmulation), Keys = GetButtons(controller), TouchX = (byte)controller.AxisValue("Touch X"), TouchY = (byte)controller.AxisValue("Touch Y"),