From ebff82b9688613e2f2f90cf88d41b473dabead08 Mon Sep 17 00:00:00 2001 From: feos Date: Sun, 23 May 2021 17:31:20 +0300 Subject: [PATCH] mame: dip switches work --- src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs | 2 +- src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.ISettable.cs | 4 ++-- src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs index 7caaf77852..ac6877f6b7 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME { public static class LibMAME { - internal const string dll = "libmamearcade.dll"; // libmamearcade.dll libpacmanshd.dll + internal const string dll = "libmamearcade.dll"; // libmamearcade.dll libpacshd.dll private const CallingConvention cc = CallingConvention.Cdecl; public enum OutputChannel diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.ISettable.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.ISettable.cs index 7fd5ceab59..da095f881f 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.ISettable.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME public class MAMESyncSettings { - public Dictionary DriverSettings { get; set; } = new Dictionary(); + public SortedDictionary DriverSettings { get; set; } = new SortedDictionary(); public static bool NeedsReboot(MAMESyncSettings x, MAMESyncSettings y) { @@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME { return new MAMESyncSettings { - DriverSettings = new Dictionary(DriverSettings) + DriverSettings = new SortedDictionary(DriverSettings) }; } } diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs index a43839135c..8938019e1f 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs @@ -153,7 +153,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME , "-nonvram_save" // prevent dumping non-volatile ram to disk , "-artpath", "mame\\artwork" // path to load artowrk from , "-diff_directory", "mame\\diff" // hdd diffs, whenever stuff is written back to an image - , "-cfg_directory", ":" // send invalid path to prevent cfg handling + , "-cfg_directory", "?" // send invalid path to prevent cfg handling , "-volume", "-32" // lowest attenuation means mame osd remains silent , "-output", "console" // print everything to hawk console , "-samplerate", _sampleRate.ToString() // match hawk samplerate