From 48080c838fa15994055f8dc4e00d0a953b7e3803 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 12 May 2017 14:32:56 -0500 Subject: [PATCH] do not mark C64 as not having ISettable..since it implements it. Group C64.ISettable.cs with C64.cs --- BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj | 4 +++- .../Computers/Commodore64/C64.ISettable.cs | 10 ++-------- BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index b3f33ae1c3..25d49fa208 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -207,7 +207,9 @@ C64.cs - + + C64.cs + C64.cs diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs index a7045392fd..a1c4c358a1 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs @@ -1,11 +1,5 @@ -using BizHawk.Emulation.Common; - -using Newtonsoft.Json; - -using System; -using System.ComponentModel; -using System.Drawing; - +using System.ComponentModel; +using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Computers.Commodore64 { diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs index a714071e45..5732a79952 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs @@ -13,7 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 "SaxxonPike", isPorted: false, isReleased: false)] - [ServiceNotApplicable(typeof(ISettable<,>))] public sealed partial class C64 : IEmulator, IRegionable { public C64(CoreComm comm, IEnumerable roms, object settings, object syncSettings)