Project_Asakura/OpenParrot
1
0
Fork 0
mirror of synced 2024-11-15 07:17:35 +01:00
Code Releases Activity

Fixed game crash with no controller connected

Browse Source
This commit is contained in:
Boomslangnz 2018-11-02 20:51:20 +13:00
parent ca20da9d23
commit 3ce0b25bd2
2 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
OpenParrot/src/Functions/Games/Other/Daytona3.cpp
View File

@ -1,4 +1,4 @@
#include <StdInc.h>
#include <StdInc.h>
#include "Utility/InitFunction.h"
#include "Functions/Global.h"
#include "Utility\Hooking.Patterns.h"
@ -41,20 +41,23 @@ static void InjectKeys()
if (track != 0)
{
BYTE track1 = *(BYTE *)(track + 0x4);
info(true, "%02X %02X", track1, gamestate);
if ((track1 == 2 || track1 == 4) && (gamestate == 0x16))
if (track1 != 0)
{
BYTE reverse = wheel * 0xFF;
if (reverse == 0x00)
*(BYTE *)(imageBase + 0x15B4678) = 0xFF;
info(true, "%02X %02X", track1, gamestate);
if ((track1 == 2 || track1 == 4) && (gamestate == 0x16))
{
BYTE reverse = wheel * 0xFF;
if (reverse == 0x00)
*(BYTE *)(imageBase + 0x15B4678) = 0xFF;
else
*(BYTE *)(imageBase + 0x15B4678) = reverse;
info(true, "Reverse wheel");
}
else
*(BYTE *)(imageBase + 0x15B4678) = reverse;
info(true, "Reverse wheel");
}
else
{
*(BYTE *)(imageBase + 0x15B4678) = wheel;
info(true, "Normal wheel1");
{
*(BYTE *)(imageBase + 0x15B4678) = wheel;
info(true, "Normal wheel1");
}
}
}
else
@ -65,35 +68,43 @@ static void InjectKeys()
if(wheel <= 0x40)
if (wheel <= 0x40)
{
//Menu Left
DWORD p = *(DWORD *)(imageBase + 0x1AAFFF0);
DWORD p1 = *(DWORD *)(p + 0x00);
if (p != 0)
{
*(BYTE *)(p1 + 0x25) = 0xFF;
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
{
*(BYTE *)(p1 + 0x25) = 0xFF;
}
}
}
else if(wheel >= 0xC0)
else if (wheel >= 0xC0)
{
//Menu Right
DWORD p = *(DWORD *)(imageBase + 0x1AAFFF0);
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
if (p != 0)
{
*(BYTE *)(p1 + 0x27) = 0xFF;
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
{
*(BYTE *)(p1 + 0x27) = 0xFF;
}
}
}
else
{
DWORD p = *(DWORD *)(imageBase + 0x1AAFFF0);
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
if (p != 0)
{
*(BYTE *)(p1 + 0x25) = 0x00;
*(BYTE *)(p1 + 0x27) = 0x00;
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
{
*(BYTE *)(p1 + 0x25) = 0x00;
*(BYTE *)(p1 + 0x27) = 0x00;
}
}
}
@ -101,19 +112,25 @@ static void InjectKeys()
{
//Inject Start
DWORD p = *(DWORD *)(imageBase + 0x1AB0010);
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
if (p != 0)
{
*(DWORD *)(p1 + 0x08) = 0x01;
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
{
*(DWORD *)(p1 + 0x08) = 0x01;
}
}
}
else
{
DWORD p = *(DWORD *)(imageBase + 0x1AB0010);
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
if (p != 0)
{
*(DWORD *)(p1 + 0x08) = 0x00;
DWORD p1 = *(DWORD *)(p + 0x00);
if (p1 != 0)
{
*(DWORD *)(p1 + 0x08) = 0x00;
}
}
}
@ -130,7 +147,7 @@ static void InjectKeys()
shiftup = false;
}
if ((buttons == 0x04) && (gear > 0x00)) //crashes right now
if ((buttons == 0x04) && (gear > 0x00))
{
if (!shiftdown)
{

53
OpenParrot/src/Functions/PokkenXInputEmu.cpp
View File

@ -308,25 +308,34 @@ __in XINPUT_VIBRATION_EX* pVibration // The vibration information to send to
}
}
static InitFunction XInputHook([]()
{
if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::Daytona3)
{
controllerInit = true;
MH_Initialize();
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetState", &XInputGetState, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputSetState", &XInputSetState, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetCapabilities", &XInputGetCapabilities, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputEnable", &XInputEnable, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetDSoundAudioDeviceGuids", &XInputGetDSoundAudioDeviceGuids, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetBatteryInformation", &XInputGetBatteryInformation, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetKeystroke", &XInputGetKeystroke, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputGetStateEx", &XInputGetStateEx, NULL);
MH_CreateHookApi(L"xinput1_3.dll", "XInputSetStateEx", &XInputSetStateEx, NULL);
MH_EnableHook(MH_ALL_HOOKS);
}
});
#pragma optimize("", on)
LPCWSTR libName = L"xinput1_3.dll";
LPCWSTR daytonalibName = L"xinput9_1_0.dll";
LPCWSTR ptrToUse;
static InitFunction XInputHook([]()
{
if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::Daytona3)
{
controllerInit = true;
MH_Initialize();
if (GameDetect::currentGame == GameID::Daytona3)
ptrToUse = daytonalibName;
else
ptrToUse = libName;
MH_CreateHookApi(ptrToUse, "XInputGetState", &XInputGetState, NULL);
MH_CreateHookApi(ptrToUse, "XInputSetState", &XInputSetState, NULL);
MH_CreateHookApi(ptrToUse, "XInputGetCapabilities", &XInputGetCapabilities, NULL);
MH_CreateHookApi(ptrToUse, "XInputEnable", &XInputEnable, NULL);
MH_CreateHookApi(ptrToUse, "XInputGetDSoundAudioDeviceGuids", &XInputGetDSoundAudioDeviceGuids, NULL);
MH_CreateHookApi(ptrToUse, "XInputGetBatteryInformation", &XInputGetBatteryInformation, NULL);
MH_CreateHookApi(ptrToUse, "XInputGetKeystroke", &XInputGetKeystroke, NULL);
MH_CreateHookApi(ptrToUse, "XInputGetStateEx", &XInputGetStateEx, NULL);
MH_CreateHookApi(ptrToUse, "XInputSetStateEx", &XInputSetStateEx, NULL);
MH_EnableHook(MH_ALL_HOOKS);
}
});
#pragma optimize("", on)´