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

Merge pull request #252 from Laupetin/fix/gamepad-mouse-move-hook

Browse Source 
Fix RawMouse patch making gamepad mouse move hook not getting called
This commit is contained in:
Jan 2022-05-04 20:35:19 +02:00 committed by GitHub
commit 6737106785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1833,13 +1833,18 @@ namespace Components
return gamePads[0].inUse; return gamePads[0].inUse;
} }
int Gamepad::CL_MouseEvent_Hk(const int x, const int y, const int dx, const int dy) void Gamepad::OnMouseMove([[maybe_unused]] const int x, [[maybe_unused]] const int y, const int dx, const int dy)
{ {
if (dx != 0 || dy != 0) if (dx != 0 || dy != 0)
{ {
gamePads[0].inUse = false; gamePads[0].inUse = false;
gpad_in_use.setRaw(false); gpad_in_use.setRaw(false);
} }
}
int Gamepad::CL_MouseEvent_Hk(const int x, const int y, const int dx, const int dy)
{
OnMouseMove(x, y, dx, dy);
// Call original function // Call original function
return Utils::Hook::Call<int(int, int, int, int)>(0x4D7C50)(x, y, dx, dy); return Utils::Hook::Call<int(int, int, int, int)>(0x4D7C50)(x, y, dx, dy);

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

@ -41,6 +41,8 @@ namespace Components
public: public:
Gamepad(); Gamepad();
static void OnMouseMove(int x, int y, int dx, int dy);
private: private:
static Game::ButtonToCodeMap_t buttonList[]; static Game::ButtonToCodeMap_t buttonList[];
static Game::StickToCodeMap_t analogStickList[4]; static Game::StickToCodeMap_t analogStickList[4];

1
src/Components/Modules/RawMouse.cpp
View File

@ -97,6 +97,7 @@ namespace Components
Game::s_wmv->oldPos = curPos; Game::s_wmv->oldPos = curPos;
ScreenToClient(Window::GetWindow(), &curPos); ScreenToClient(Window::GetWindow(), &curPos);
Gamepad::OnMouseMove(curPos.x, curPos.y, dx, dy);
auto recenterMouse = Game::CL_MouseEvent(curPos.x, curPos.y, dx, dy); auto recenterMouse = Game::CL_MouseEvent(curPos.x, curPos.y, dx, dy);
if (recenterMouse) if (recenterMouse)