From 11bfe52e68a9e86afae75a11bff6d77bd13af443 Mon Sep 17 00:00:00 2001 From: Boomslangnz Date: Tue, 6 Nov 2018 23:02:11 +1300 Subject: [PATCH 1/3] Fixed x64 not building correctly --- OpenParrot/src/Functions/PokkenXInputEmu.cpp | 8 +++++--- OpenParrot/src/Functions/PokkenXInputEmu.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenParrot/src/Functions/PokkenXInputEmu.cpp b/OpenParrot/src/Functions/PokkenXInputEmu.cpp index 4268566..ea652b8 100644 --- a/OpenParrot/src/Functions/PokkenXInputEmu.cpp +++ b/OpenParrot/src/Functions/PokkenXInputEmu.cpp @@ -76,12 +76,12 @@ DWORD WINAPI XInputGetState gamepadState.wButtons |= *ffbOffset; else gamepadState.wButtons |= 0; - +#ifndef _M_AMD64 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00; } - +#endif if (pState->dwPacketNumber == UINT_MAX) pState->dwPacketNumber = 0; else @@ -280,11 +280,13 @@ DWORD WINAPI XInputGetStateEx else gamepadState.wButtons = 0; +#ifndef _M_AMD64 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00; } - +#endif + if (pState->dwPacketNumber == UINT_MAX) pState->dwPacketNumber = 0; else diff --git a/OpenParrot/src/Functions/PokkenXInputEmu.h b/OpenParrot/src/Functions/PokkenXInputEmu.h index b70b944..03fe014 100644 --- a/OpenParrot/src/Functions/PokkenXInputEmu.h +++ b/OpenParrot/src/Functions/PokkenXInputEmu.h @@ -151,4 +151,4 @@ typedef struct _XINPUT_KEYSTROKE BYTE HidCode; } XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE; -extern bool daytonaPressStart; \ No newline at end of file +extern bool daytonaPressStart; From 459bc9132a3b5cb3901bfb8a7782582371c25e7c Mon Sep 17 00:00:00 2001 From: Boomslangnz Date: Wed, 7 Nov 2018 16:29:30 +1300 Subject: [PATCH 2/3] Fix issue with x64 not building correctly after Daytona changes --- OpenParrot/src/Functions/PokkenXInputEmu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenParrot/src/Functions/PokkenXInputEmu.cpp b/OpenParrot/src/Functions/PokkenXInputEmu.cpp index ea652b8..ebca26c 100644 --- a/OpenParrot/src/Functions/PokkenXInputEmu.cpp +++ b/OpenParrot/src/Functions/PokkenXInputEmu.cpp @@ -76,7 +76,7 @@ DWORD WINAPI XInputGetState gamepadState.wButtons |= *ffbOffset; else gamepadState.wButtons |= 0; -#ifndef _M_AMD64 +#ifdef i386 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00; @@ -280,7 +280,7 @@ DWORD WINAPI XInputGetStateEx else gamepadState.wButtons = 0; -#ifndef _M_AMD64 +#ifdef i386 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00; From 9c75be2f7acf7fd02b74862f0a4274a8a596e4b1 Mon Sep 17 00:00:00 2001 From: Boomslangnz Date: Wed, 7 Nov 2018 20:29:22 +1300 Subject: [PATCH 3/3] fix x64 3rd time lucky --- OpenParrot/src/Functions/PokkenXInputEmu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenParrot/src/Functions/PokkenXInputEmu.cpp b/OpenParrot/src/Functions/PokkenXInputEmu.cpp index ebca26c..9f3a09b 100644 --- a/OpenParrot/src/Functions/PokkenXInputEmu.cpp +++ b/OpenParrot/src/Functions/PokkenXInputEmu.cpp @@ -76,7 +76,7 @@ DWORD WINAPI XInputGetState gamepadState.wButtons |= *ffbOffset; else gamepadState.wButtons |= 0; -#ifdef i386 +#ifdef _M_IX86 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00; @@ -280,7 +280,7 @@ DWORD WINAPI XInputGetStateEx else gamepadState.wButtons = 0; -#ifdef i386 +#ifdef _M_IX86 if (GameDetect::currentGame == GameID::Daytona3) { gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00;