Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Disable mouse cursor when controller is active

Browse Source
This commit is contained in:
Jan 2021-08-23 01:19:20 +02:00
parent cc9a2b0bac
commit 6434526fcb
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Components/Modules/Gamepad.cpp
View File

@ -1403,6 +1403,40 @@ namespace Components
Utils::Hook::Call<void(int, int, int, unsigned)>(0x4F6480)(localClientNum, key, down, time);
}
bool Gamepad::IsGamePadInUse()
{
return gamePads[0].inUse;
}
__declspec(naked) void Gamepad::CL_MouseEvent_Stub()
{
__asm
{
pushad
cmp eax, 6
jz hideCursor
call IsGamePadInUse
test al, al
jnz hideCursor
// Continue checks
popad
push 0x4D7C68
retn;
hideCursor:
popad
push 0x4D7C8A
retn
}
}
bool Gamepad::UI_RefreshViewport_Hk()
{
return Dvar::Var("cl_bypassMouseInput").get<bool>() || IsGamePadInUse();
}
void Gamepad::CreateKeyNameMap()
{
memcpy(Game::combinedKeyNames, Game::vanillaKeyNames, sizeof(Game::keyname_t) * Game::VANILLA_KEY_NAME_COUNT);
@ -1460,6 +1494,10 @@ namespace Components
// Mark controller as unused when keyboard key is pressed
Utils::Hook(0x43D179, CL_KeyEvent_Hk, HOOK_CALL).install()->quick();
// Hide cursor when controller is active
Utils::Hook(0x4D7C63, CL_MouseEvent_Stub, HOOK_JUMP).install()->quick(); // Disable cursor
Utils::Hook(0x48E527, UI_RefreshViewport_Hk, HOOK_CALL).install()->quick(); // Do not draw cursor
// Only return gamepad keys when gamepad enabled and only non gamepad keys when not
Utils::Hook(0x5A7A23, Key_GetCommandAssignmentInternal_Hk, HOOK_CALL).install()->quick();

4
src/Components/Modules/Gamepad.hpp
View File

@ -276,8 +276,10 @@ namespace Components
static void IN_Init_Hk();
static int Key_GetCommandAssignmentInternal_Hk(const char* cmd, int(*keys)[2]);
static void Key_GetCommandAssignmentInternal_Stub();
static bool IsGamePadInUse();
static void CL_KeyEvent_Hk(int localClientNum, int key, int down, unsigned int time);
static void CL_MouseEvent_Stub();
static bool UI_RefreshViewport_Hk();
static void CreateKeyNameMap();
};
}