From 307d85cee056298a6271f6537947296aeaa80a58 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Mon, 8 May 2017 17:42:57 -0400 Subject: [PATCH] The point of INPUT_KEYS is to document actual behavior, so lets fix it --- .../Consoles/Sega/gpgx/GPGXControlConverter.cs | 4 ++-- BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs index c6abc8720a..18694ecf57 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs @@ -63,8 +63,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx { new CName("Lightgun Trigger", LibGPGX.INPUT_KEYS.INPUT_MENACER_TRIGGER), new CName("Lightgun Start", LibGPGX.INPUT_KEYS.INPUT_MENACER_START), - new CName("Lightgun B", LibGPGX.INPUT_KEYS.INPUT_MOUSE_RIGHT), - new CName("Lightgun C", LibGPGX.INPUT_KEYS.INPUT_MOUSE_LEFT) + new CName("Lightgun B", LibGPGX.INPUT_KEYS.INPUT_MENACER_B), + new CName("Lightgun C", LibGPGX.INPUT_KEYS.INPUT_MENACER_C) }; static CName[] Activator = diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs index 46d6c181a9..5113ff851c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs @@ -237,6 +237,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx /* Menacer */ INPUT_MENACER_TRIGGER = 0x0040, INPUT_MENACER_START = 0x0080, + INPUT_MENACER_B = 0x0020, + INPUT_MENACER_C = 0x0010 }; [StructLayout(LayoutKind.Sequential)]