From 77bba444fdb80f0831a40a5cf4ee6b8f8ba90252 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Thu, 28 Jun 2018 18:10:28 -0400 Subject: [PATCH] A7800: Fix unplugged controller and Pokey sound --- .../Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs | 2 +- .../Consoles/Atari/A7800Hawk/A7800HawkControllers.cs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs index a4aa5a5b3d..c3e0aae02f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs @@ -383,7 +383,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk pokey.GetSamples(ret2); for (int i = 0; i < _spf * 2; i ++) { - ret[i] += ret2[i]; + ret[i] += (short)(ret2[i] * 3); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs index 2b29b747d2..183e248567 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs @@ -38,7 +38,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk PortNum = portNum; Definition = new ControllerDefinition { - BoolButtons = new List() + Name = "Unplugged Controller", + BoolButtons = BaseDefinition + .Select(b => "P" + PortNum + " " + b) + .ToList() }; } @@ -71,6 +74,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk public ControllerDefinition Definition { get; } + private static readonly string[] BaseDefinition = + { + "" + }; + public void SyncState(Serializer ser) { // Do nothing