From 4260ad528b894faec1f3d7b8b68e17fcf5bda140 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 23 Apr 2017 12:47:26 -0500 Subject: [PATCH] Intellivision - implement the BoardName property --- BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs | 4 +++- BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs | 2 ++ BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs | 2 ++ .../Consoles/Intellivision/Intellivision.IEmulator.cs | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs index e46f57a7d0..85bb74bed5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs @@ -14,7 +14,9 @@ namespace BizHawk.Emulation.Cores.Intellivision // There are 10 mappers Intellivision games use (not counting intellicart which is handled seperately) // we will pick the mapper from the game DB and default to 0 - private int mapper = 0; + private int mapper = 0; + + public string BoardName => $"Mapper {mapper}"; public void SyncState(Serializer ser) { diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs index e05b236cf8..52045ba48e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs @@ -9,5 +9,7 @@ namespace BizHawk.Emulation.Cores.Intellivision bool WriteCart(ushort addr, ushort value, bool poke); void SyncState(Serializer ser); + + string BoardName { get; } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs index 8ea6be881d..2da0ca6a14 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs @@ -5,6 +5,8 @@ namespace BizHawk.Emulation.Cores.Intellivision { public sealed class Intellicart : ICart { + public string BoardName => $"Intellicart"; + public void SyncState(Serializer ser) { ser.BeginSection("Cart"); diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs index 9e1599675d..8aead5241d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs @@ -125,8 +125,7 @@ namespace BizHawk.Emulation.Cores.Intellivision public bool DeterministicEmulation => true; - [FeatureNotImplemented] - public string BoardName => null; + public string BoardName => _cart.BoardName; public void ResetCounters() {