From b39421d7ab18ee0330c8063ee2ac6a91f45d3f02 Mon Sep 17 00:00:00 2001 From: dinkc64 Date: Fri, 14 Jun 2019 19:28:34 -0400 Subject: [PATCH] neogeo macros for neocd --- src/burner/gami.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/burner/gami.cpp b/src/burner/gami.cpp index 7d6be42de..fa1c39697 100644 --- a/src/burner/gami.cpp +++ b/src/burner/gami.cpp @@ -25,6 +25,8 @@ UINT8 macroSystemSaveState = 0; UINT8 macroSystemLoadState = 0; UINT8 macroSystemUNDOState = 0; +#define HW_NEOGEO ( ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SNK_NEOGEO) || ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SNK_NEOCD) ) + // --------------------------------------------------------------------------- // Check if the left alt (menu) key is mapped @@ -227,7 +229,7 @@ static void GameInpInitMacros() nKickInputs[nPlayer][2] = i; } - if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SNK_NEOGEO) { + if (HW_NEOGEO) { if (_stricmp(" Button A", bii.szName + 2) == 0) { nNeogeoButtons[nPlayer][0] = i; } @@ -335,7 +337,7 @@ static void GameInpInitMacros() } else { sprintf(pgi->Macro.szName, "P%d Auto-Fire Button %d", nPlayer+1, i+1); } - if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SNK_NEOGEO) { + if (HW_NEOGEO) { BurnDrvGetInputInfo(&bii, nNeogeoButtons[nPlayer][i]); } else { BurnDrvGetInputInfo(&bii, nPgmButtons[nPlayer][i]); @@ -381,7 +383,7 @@ static void GameInpInitMacros() pgi++; } - if (nFireButtons == 4 && (BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SNK_NEOGEO) { + if (nFireButtons == 4 && HW_NEOGEO) { pgi->nInput = GIT_MACRO_AUTO; pgi->nType = BIT_DIGITAL; pgi->Macro.nMode = 0; @@ -1651,7 +1653,7 @@ INT32 ConfigGameLoadHardwareDefaults() nApplyHardwareDefaults = 1; } - if (nHardwareFlag == HARDWARE_SNK_NEOGEO) { + if (nHardwareFlag == HARDWARE_SNK_NEOGEO || nHardwareFlag == HARDWARE_SNK_NEOCD) { szFileName = szDefaultNeogeoFile; nApplyHardwareDefaults = 1; }