1
0
mirror of synced 2025-02-23 21:43:35 +01:00

Merge pull request #46 from 00C0FFEE/FNF-fixes

Fnf fixes
This commit is contained in:
Reaver 2019-06-17 11:24:51 +03:00 committed by GitHub
commit f4d68324c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 173 additions and 173 deletions

View File

@ -190,8 +190,8 @@ DWORD WINAPI InputRT3(LPVOID lpParam)
}
// BUTTON 2/ VIEW 2
if (*ffbOffset & 0x400)
if (button3pressed == false)
{
if (button3pressed == false)
{
injector::WriteMemory<BYTE>((keyboardBuffer + DIK_B), 2, true);
keybd_event(0x71, MapVirtualKey(0x71, MAPVK_VK_TO_VSC), 0, 0);

View File

@ -168,12 +168,13 @@ DWORD WINAPI InputRT4(LPVOID lpParam)
previousUp = false;
}
}
// BUTTON 1/ VIEW 1
// BUTTON 1/ VIEW
if (*ffbOffset & 0x200)
{
if (button2pressed == false)
{
injector::MakeNOP((0x35BA5 + BaseAddress4), 2);
injector::WriteMemory<BYTE>((keyboardBuffer + DIK_F), 2, true);
keybd_event(0x70, MapVirtualKey(0x70, MAPVK_VK_TO_VSC), 0, 0);
button2pressed = true;
}
@ -187,13 +188,13 @@ DWORD WINAPI InputRT4(LPVOID lpParam)
button2pressed = false;
}
}
// BUTTON 2/ VIEW 2
// BUTTON 2/ MUSIC
if (*ffbOffset & 0x400)
{
if (button3pressed == false)
{
{
injector::WriteMemory<BYTE>((keyboardBuffer + DIK_B), 2, true);
keybd_event(0x71, MapVirtualKey(0x71, MAPVK_VK_TO_VSC), 0, 0);
keybd_event(0xDC, MapVirtualKey(0xDC, MAPVK_VK_TO_VSC), 0, 0);
button3pressed = true;
}
}
@ -201,17 +202,17 @@ DWORD WINAPI InputRT4(LPVOID lpParam)
{
if (button3pressed == true)
{
keybd_event(0x70, MapVirtualKey(0x71, MAPVK_VK_TO_VSC), KEYEVENTF_KEYUP, 0);
keybd_event(0xDC, MapVirtualKey(0xDC, MAPVK_VK_TO_VSC), KEYEVENTF_KEYUP, 0);
button3pressed = false;
}
}
// BUTTON 3/ VIEW 3
// BUTTON 3/ OTHER
if (*ffbOffset & 0x800)
{
if (button4pressed == false)
{
injector::WriteMemory<BYTE>((keyboardBuffer + DIK_E), 2, true);
keybd_event(0x73, MapVirtualKey(0x73, MAPVK_VK_TO_VSC), 0, 0);
injector::WriteMemory<BYTE>((keyboardBuffer + DIK_J), 2, true);
button4pressed = true;
}
}
@ -219,7 +220,6 @@ DWORD WINAPI InputRT4(LPVOID lpParam)
{
if (button4pressed == true)
{
keybd_event(0x73, MapVirtualKey(0x73, MAPVK_VK_TO_VSC), KEYEVENTF_KEYUP, 0);
button4pressed = false;
}
}
@ -319,9 +319,9 @@ DWORD WINAPI InputRT4(LPVOID lpParam)
// info(true, "test values *ffbOffset2=0x%02X / *iWheel=%d / *wheel=%f ", *ffbOffset2, iWheel, fx);
//DEBUG//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Sleep(deltaTimer);
SleepEx(deltaTimer,1);
}
return 0;
// return 0;
}

View File

@ -80,7 +80,7 @@ static InitFunction initFunc([]()
{
if (GameDetect::currentGame == GameID::BG4)
return;
if (GameDetect::currentGame == GameID::FNFSC) // FORCE BORDERLESS WINDOW MODE FOR FULLSCREEN
if (GameDetect::currentGame == GameID::FNFSC)
InitD3D8WindowHook();
if (ToBool(config["General"]["Windowed"]))
{