Merge pull request #240 from XLabsProject/fix-gamepad
[Gamepad] Fix hook conflitcs
This commit is contained in:
Edo
GitHub
commit
9f574be237
File diff suppressed because it is too large
Load Diff
@ -2,202 +2,202 @@
|
||||
|
||||
namespace Components
|
||||
{
|
||||
class Gamepad : public Component
|
||||
{
|
||||
struct ControllerMenuKeyMapping
|
||||
{
|
||||
Game::keyNum_t controllerKey;
|
||||
Game::keyNum_t pcKey;
|
||||
};
|
||||
class Gamepad : public Component
|
||||
{
|
||||
struct ControllerMenuKeyMapping
|
||||
{
|
||||
Game::keyNum_t controllerKey;
|
||||
Game::keyNum_t pcKey;
|
||||
};
|
||||
|
||||
struct GamePad
|
||||
{
|
||||
bool enabled;
|
||||
bool inUse;
|
||||
int portIndex;
|
||||
unsigned short digitals;
|
||||
unsigned short lastDigitals;
|
||||
float analogs[2];
|
||||
float lastAnalogs[2];
|
||||
float sticks[4];
|
||||
float lastSticks[4];
|
||||
bool stickDown[4][Game::GPAD_STICK_DIR_COUNT];
|
||||
bool stickDownLast[4][Game::GPAD_STICK_DIR_COUNT];
|
||||
float lowRumble;
|
||||
float highRumble;
|
||||
struct GamePad
|
||||
{
|
||||
bool enabled;
|
||||
bool inUse;
|
||||
int portIndex;
|
||||
unsigned short digitals;
|
||||
unsigned short lastDigitals;
|
||||
float analogs[2];
|
||||
float lastAnalogs[2];
|
||||
float sticks[4];
|
||||
float lastSticks[4];
|
||||
bool stickDown[4][Game::GPAD_STICK_DIR_COUNT];
|
||||
bool stickDownLast[4][Game::GPAD_STICK_DIR_COUNT];
|
||||
float lowRumble;
|
||||
float highRumble;
|
||||
|
||||
XINPUT_VIBRATION rumble;
|
||||
XINPUT_CAPABILITIES caps;
|
||||
};
|
||||
XINPUT_VIBRATION rumble;
|
||||
XINPUT_CAPABILITIES caps;
|
||||
};
|
||||
|
||||
struct GamePadGlobals
|
||||
{
|
||||
Game::GpadAxesGlob axes;
|
||||
unsigned nextScrollTime;
|
||||
struct GamePadGlobals
|
||||
{
|
||||
Game::GpadAxesGlob axes;
|
||||
unsigned nextScrollTime;
|
||||
|
||||
GamePadGlobals();
|
||||
};
|
||||
GamePadGlobals();
|
||||
};
|
||||
|
||||
public:
|
||||
Gamepad();
|
||||
public:
|
||||
Gamepad();
|
||||
|
||||
private:
|
||||
static Game::ButtonToCodeMap_t buttonList[];
|
||||
static Game::StickToCodeMap_t analogStickList[4];
|
||||
static Game::GamePadStick stickForAxis[];
|
||||
static Game::GamepadPhysicalAxis axisSameStick[];
|
||||
static const char* physicalAxisNames[];
|
||||
static const char* virtualAxisNames[];
|
||||
static const char* gamePadMappingTypeNames[];
|
||||
static Game::keyNum_t menuScrollButtonList[];
|
||||
static Game::keyname_t extendedKeyNames[];
|
||||
static Game::keyname_t extendedLocalizedKeyNamesXenon[];
|
||||
static Game::keyname_t extendedLocalizedKeyNamesPs3[];
|
||||
static Game::keyname_t combinedKeyNames[];
|
||||
static Game::keyname_t combinedLocalizedKeyNamesXenon[];
|
||||
static Game::keyname_t combinedLocalizedKeyNamesPs3[];
|
||||
static ControllerMenuKeyMapping controllerMenuKeyMappings[];
|
||||
private:
|
||||
static Game::ButtonToCodeMap_t buttonList[];
|
||||
static Game::StickToCodeMap_t analogStickList[4];
|
||||
static Game::GamePadStick stickForAxis[];
|
||||
static Game::GamepadPhysicalAxis axisSameStick[];
|
||||
static const char* physicalAxisNames[];
|
||||
static const char* virtualAxisNames[];
|
||||
static const char* gamePadMappingTypeNames[];
|
||||
static Game::keyNum_t menuScrollButtonList[];
|
||||
static Game::keyname_t extendedKeyNames[];
|
||||
static Game::keyname_t extendedLocalizedKeyNamesXenon[];
|
||||
static Game::keyname_t extendedLocalizedKeyNamesPs3[];
|
||||
static Game::keyname_t combinedKeyNames[];
|
||||
static Game::keyname_t combinedLocalizedKeyNamesXenon[];
|
||||
static Game::keyname_t combinedLocalizedKeyNamesPs3[];
|
||||
static ControllerMenuKeyMapping controllerMenuKeyMappings[];
|
||||
|
||||
static GamePad gamePads[Game::MAX_GAMEPADS];
|
||||
static GamePadGlobals gamePadGlobals[Game::MAX_GAMEPADS];
|
||||
static GamePad gamePads[Game::MAX_GAMEPADS];
|
||||
static GamePadGlobals gamePadGlobals[Game::MAX_GAMEPADS];
|
||||
|
||||
static int gamePadBindingsModifiedFlags;
|
||||
static int gamePadBindingsModifiedFlags;
|
||||
|
||||
static Dvar::Var gpad_enabled;
|
||||
static Dvar::Var gpad_debug;
|
||||
static Dvar::Var gpad_present;
|
||||
static Dvar::Var gpad_in_use;
|
||||
static Dvar::Var gpad_style;
|
||||
static Dvar::Var gpad_sticksConfig;
|
||||
static Dvar::Var gpad_buttonConfig;
|
||||
static Dvar::Var gpad_menu_scroll_delay_first;
|
||||
static Dvar::Var gpad_menu_scroll_delay_rest;
|
||||
static Dvar::Var gpad_rumble;
|
||||
static Dvar::Var gpad_stick_pressed_hysteresis;
|
||||
static Dvar::Var gpad_stick_pressed;
|
||||
static Dvar::Var gpad_stick_deadzone_max;
|
||||
static Dvar::Var gpad_stick_deadzone_min;
|
||||
static Dvar::Var gpad_button_deadzone;
|
||||
static Dvar::Var gpad_button_rstick_deflect_max;
|
||||
static Dvar::Var gpad_button_lstick_deflect_max;
|
||||
static Dvar::Var gpad_use_hold_time;
|
||||
static Dvar::Var gpad_lockon_enabled;
|
||||
static Dvar::Var gpad_slowdown_enabled;
|
||||
static Dvar::Var input_viewSensitivity;
|
||||
static Dvar::Var input_invertPitch;
|
||||
static Dvar::Var sv_allowAimAssist;
|
||||
static Dvar::Var aim_turnrate_pitch;
|
||||
static Dvar::Var aim_turnrate_pitch_ads;
|
||||
static Dvar::Var aim_turnrate_yaw;
|
||||
static Dvar::Var aim_turnrate_yaw_ads;
|
||||
static Dvar::Var aim_accel_turnrate_enabled;
|
||||
static Dvar::Var aim_accel_turnrate_lerp;
|
||||
static Dvar::Var aim_input_graph_enabled;
|
||||
static Dvar::Var aim_input_graph_index;
|
||||
static Dvar::Var aim_scale_view_axis;
|
||||
static Dvar::Var cl_bypassMouseInput;
|
||||
static Dvar::Var cg_mapLocationSelectionCursorSpeed;
|
||||
static Dvar::Var aim_aimAssistRangeScale;
|
||||
static Dvar::Var aim_slowdown_enabled;
|
||||
static Dvar::Var aim_slowdown_debug;
|
||||
static Dvar::Var aim_slowdown_pitch_scale;
|
||||
static Dvar::Var aim_slowdown_pitch_scale_ads;
|
||||
static Dvar::Var aim_slowdown_yaw_scale;
|
||||
static Dvar::Var aim_slowdown_yaw_scale_ads;
|
||||
static Dvar::Var aim_lockon_enabled;
|
||||
static Dvar::Var aim_lockon_deflection;
|
||||
static Dvar::Var aim_lockon_pitch_strength;
|
||||
static Dvar::Var aim_lockon_strength;
|
||||
static Dvar::Var gpad_enabled;
|
||||
static Dvar::Var gpad_debug;
|
||||
static Dvar::Var gpad_present;
|
||||
static Dvar::Var gpad_in_use;
|
||||
static Dvar::Var gpad_style;
|
||||
static Dvar::Var gpad_sticksConfig;
|
||||
static Dvar::Var gpad_buttonConfig;
|
||||
static Dvar::Var gpad_menu_scroll_delay_first;
|
||||
static Dvar::Var gpad_menu_scroll_delay_rest;
|
||||
static Dvar::Var gpad_rumble;
|
||||
static Dvar::Var gpad_stick_pressed_hysteresis;
|
||||
static Dvar::Var gpad_stick_pressed;
|
||||
static Dvar::Var gpad_stick_deadzone_max;
|
||||
static Dvar::Var gpad_stick_deadzone_min;
|
||||
static Dvar::Var gpad_button_deadzone;
|
||||
static Dvar::Var gpad_button_rstick_deflect_max;
|
||||
static Dvar::Var gpad_button_lstick_deflect_max;
|
||||
static Dvar::Var gpad_use_hold_time;
|
||||
static Dvar::Var gpad_lockon_enabled;
|
||||
static Dvar::Var gpad_slowdown_enabled;
|
||||
static Dvar::Var input_viewSensitivity;
|
||||
static Dvar::Var input_invertPitch;
|
||||
static Dvar::Var sv_allowAimAssist;
|
||||
static Dvar::Var aim_turnrate_pitch;
|
||||
static Dvar::Var aim_turnrate_pitch_ads;
|
||||
static Dvar::Var aim_turnrate_yaw;
|
||||
static Dvar::Var aim_turnrate_yaw_ads;
|
||||
static Dvar::Var aim_accel_turnrate_enabled;
|
||||
static Dvar::Var aim_accel_turnrate_lerp;
|
||||
static Dvar::Var aim_input_graph_enabled;
|
||||
static Dvar::Var aim_input_graph_index;
|
||||
static Dvar::Var aim_scale_view_axis;
|
||||
static Dvar::Var cl_bypassMouseInput;
|
||||
static Dvar::Var cg_mapLocationSelectionCursorSpeed;
|
||||
static Dvar::Var aim_aimAssistRangeScale;
|
||||
static Dvar::Var aim_slowdown_enabled;
|
||||
static Dvar::Var aim_slowdown_debug;
|
||||
static Dvar::Var aim_slowdown_pitch_scale;
|
||||
static Dvar::Var aim_slowdown_pitch_scale_ads;
|
||||
static Dvar::Var aim_slowdown_yaw_scale;
|
||||
static Dvar::Var aim_slowdown_yaw_scale_ads;
|
||||
static Dvar::Var aim_lockon_enabled;
|
||||
static Dvar::Var aim_lockon_deflection;
|
||||
static Dvar::Var aim_lockon_pitch_strength;
|
||||
static Dvar::Var aim_lockon_strength;
|
||||
|
||||
static void MSG_WriteDeltaUsercmdKeyStub();
|
||||
static void MSG_WriteDeltaUsercmdKeyStub();
|
||||
|
||||
static void ApplyMovement(Game::msg_t* msg, int key, Game::usercmd_s* from, Game::usercmd_s* to);
|
||||
static void ApplyMovement(Game::msg_t* msg, int key, Game::usercmd_s* from, Game::usercmd_s* to);
|
||||
|
||||
static void MSG_ReadDeltaUsercmdKeyStub();
|
||||
static void MSG_ReadDeltaUsercmdKeyStub2();
|
||||
static void MSG_ReadDeltaUsercmdKeyStub();
|
||||
static void MSG_ReadDeltaUsercmdKeyStub2();
|
||||
|
||||
static float LinearTrack(float target, float current, float rate, float deltaTime);
|
||||
static bool AimAssist_DoBoundsIntersectCenterBox(const float* clipMins, const float* clipMaxs, float clipHalfWidth, float clipHalfHeight);
|
||||
static bool AimAssist_IsPlayerUsingOffhand(Game::AimAssistPlayerState* ps);
|
||||
static const Game::AimScreenTarget* AimAssist_GetBestTarget(const Game::AimAssistGlobals* aaGlob, float range, float regionWidth, float regionHeight);
|
||||
static const Game::AimScreenTarget* AimAssist_GetTargetFromEntity(const Game::AimAssistGlobals* aaGlob, int entIndex);
|
||||
static const Game::AimScreenTarget* AimAssist_GetPrevOrBestTarget(const Game::AimAssistGlobals* aaGlob, float range, float regionWidth, float regionHeight, int prevTargetEnt);
|
||||
static bool AimAssist_IsLockonActive(int gamePadIndex);
|
||||
static void AimAssist_ApplyLockOn(const Game::AimInput* input, Game::AimOutput* output);
|
||||
static void AimAssist_CalcAdjustedAxis(const Game::AimInput* input, float* pitchAxis, float* yawAxis);
|
||||
static bool AimAssist_IsSlowdownActive(const Game::AimAssistPlayerState* ps);
|
||||
static void AimAssist_CalcSlowdown(const Game::AimInput* input, float* pitchScale, float* yawScale);
|
||||
static float AimAssist_Lerp(float from, float to, float fraction);
|
||||
static void AimAssist_ApplyTurnRates(const Game::AimInput* input, Game::AimOutput* output);
|
||||
static void AimAssist_UpdateGamePadInput(const Game::AimInput* input, Game::AimOutput* output);
|
||||
static float LinearTrack(float target, float current, float rate, float deltaTime);
|
||||
static bool AimAssist_DoBoundsIntersectCenterBox(const float* clipMins, const float* clipMaxs, float clipHalfWidth, float clipHalfHeight);
|
||||
static bool AimAssist_IsPlayerUsingOffhand(Game::AimAssistPlayerState* ps);
|
||||
static const Game::AimScreenTarget* AimAssist_GetBestTarget(const Game::AimAssistGlobals* aaGlob, float range, float regionWidth, float regionHeight);
|
||||
static const Game::AimScreenTarget* AimAssist_GetTargetFromEntity(const Game::AimAssistGlobals* aaGlob, int entIndex);
|
||||
static const Game::AimScreenTarget* AimAssist_GetPrevOrBestTarget(const Game::AimAssistGlobals* aaGlob, float range, float regionWidth, float regionHeight, int prevTargetEnt);
|
||||
static bool AimAssist_IsLockonActive(int gamePadIndex);
|
||||
static void AimAssist_ApplyLockOn(const Game::AimInput* input, Game::AimOutput* output);
|
||||
static void AimAssist_CalcAdjustedAxis(const Game::AimInput* input, float* pitchAxis, float* yawAxis);
|
||||
static bool AimAssist_IsSlowdownActive(const Game::AimAssistPlayerState* ps);
|
||||
static void AimAssist_CalcSlowdown(const Game::AimInput* input, float* pitchScale, float* yawScale);
|
||||
static float AimAssist_Lerp(float from, float to, float fraction);
|
||||
static void AimAssist_ApplyTurnRates(const Game::AimInput* input, Game::AimOutput* output);
|
||||
static void AimAssist_UpdateGamePadInput(const Game::AimInput* input, Game::AimOutput* output);
|
||||
|
||||
static void CL_RemoteControlMove_GamePad(int localClientNum, Game::usercmd_s* cmd);
|
||||
static void CL_RemoteControlMove_Stub();
|
||||
static bool CG_HandleLocationSelectionInput_GamePad(int localClientNum, Game::usercmd_s* cmd);
|
||||
static void CG_HandleLocationSelectionInput_Stub();
|
||||
static bool CG_ShouldUpdateViewAngles(int localClientNum);
|
||||
static float CL_GamepadAxisValue(int gamePadIndex, Game::GamepadVirtualAxis virtualAxis);
|
||||
static char ClampChar(int value);
|
||||
static void CL_GamepadMove(int gamePadIndex, Game::usercmd_s* cmd, float frameTimeBase);
|
||||
static void CL_MouseMove_Stub();
|
||||
static void CL_RemoteControlMove_GamePad(int localClientNum, Game::usercmd_s* cmd);
|
||||
static void CL_RemoteControlMove_Stub();
|
||||
static bool CG_HandleLocationSelectionInput_GamePad(int localClientNum, Game::usercmd_s* cmd);
|
||||
static void CG_HandleLocationSelectionInput_Stub();
|
||||
static bool CG_ShouldUpdateViewAngles(int localClientNum);
|
||||
static float CL_GamepadAxisValue(int gamePadIndex, Game::GamepadVirtualAxis virtualAxis);
|
||||
static char ClampChar(int value);
|
||||
static void CL_GamepadMove(int gamePadIndex, Game::usercmd_s* cmd, float frameTimeBase);
|
||||
static void CL_MouseMove_Stub();
|
||||
|
||||
static bool Gamepad_ShouldUse(const Game::gentity_s* playerEnt, unsigned useTime);
|
||||
static void Player_UseEntity_Stub();
|
||||
static bool Gamepad_ShouldUse(const Game::gentity_s* playerEnt, unsigned useTime);
|
||||
static void Player_UseEntity_Stub();
|
||||
|
||||
static bool Key_IsValidGamePadChar(int key);
|
||||
static void CL_GamepadResetMenuScrollTime(int gamePadIndex, int key, bool down, unsigned int time);
|
||||
static bool Scoreboard_HandleInput(int gamePadIndex, int key);
|
||||
static bool CL_CheckForIgnoreDueToRepeat(int gamePadIndex, int key, int repeatCount, unsigned int time);
|
||||
static void UI_GamepadKeyEvent(int gamePadIndex, int key, bool down);
|
||||
static void CL_GamepadGenerateAPad(int gamePadIndex, Game::GamepadPhysicalAxis physicalAxis, unsigned time);
|
||||
static void CL_GamepadEvent(int gamePadIndex, Game::GamepadPhysicalAxis physicalAxis, float value, unsigned time);
|
||||
static void CL_GamepadButtonEvent(int gamePadIndex, int key, Game::GamePadButtonEvent buttonEvent, unsigned time);
|
||||
static void CL_GamepadButtonEventForPort(int gamePadIndex, int key, Game::GamePadButtonEvent buttonEvent, unsigned int time);
|
||||
static bool Key_IsValidGamePadChar(int key);
|
||||
static void CL_GamepadResetMenuScrollTime(int gamePadIndex, int key, bool down, unsigned int time);
|
||||
static bool Scoreboard_HandleInput(int gamePadIndex, int key);
|
||||
static bool CL_CheckForIgnoreDueToRepeat(int gamePadIndex, int key, int repeatCount, unsigned int time);
|
||||
static void UI_GamepadKeyEvent(int gamePadIndex, int key, bool down);
|
||||
static void CL_GamepadGenerateAPad(int gamePadIndex, Game::GamepadPhysicalAxis physicalAxis, unsigned time);
|
||||
static void CL_GamepadEvent(int gamePadIndex, Game::GamepadPhysicalAxis physicalAxis, float value, unsigned time);
|
||||
static void CL_GamepadButtonEvent(int gamePadIndex, int key, Game::GamePadButtonEvent buttonEvent, unsigned time);
|
||||
static void CL_GamepadButtonEventForPort(int gamePadIndex, int key, Game::GamePadButtonEvent buttonEvent, unsigned int time);
|
||||
|
||||
static void GPad_ConvertStickToFloat(short x, short y, float& outX, float& outY);
|
||||
static float GPad_GetStick(int gamePadIndex, Game::GamePadStick stick);
|
||||
static float GPad_GetButton(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_IsButtonPressed(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_ButtonRequiresUpdates(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_IsButtonReleased(int gamePadIndex, Game::GamePadButton button);
|
||||
static void GPad_ConvertStickToFloat(short x, short y, float& outX, float& outY);
|
||||
static float GPad_GetStick(int gamePadIndex, Game::GamePadStick stick);
|
||||
static float GPad_GetButton(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_IsButtonPressed(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_ButtonRequiresUpdates(int gamePadIndex, Game::GamePadButton button);
|
||||
static bool GPad_IsButtonReleased(int gamePadIndex, Game::GamePadButton button);
|
||||
|
||||
static void GPad_UpdateSticksDown(int gamePadIndex);
|
||||
static void GPad_UpdateSticks(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
static void GPad_UpdateDigitals(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
static void GPad_UpdateAnalogs(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
static void GPad_UpdateSticksDown(int gamePadIndex);
|
||||
static void GPad_UpdateSticks(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
static void GPad_UpdateDigitals(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
static void GPad_UpdateAnalogs(int gamePadIndex, const XINPUT_GAMEPAD& state);
|
||||
|
||||
static bool GPad_Check(int gamePadIndex, int portIndex);
|
||||
static void GPad_RefreshAll();
|
||||
static void GPad_UpdateAll();
|
||||
static void IN_GamePadsMove();
|
||||
static void IN_Frame_Hk();
|
||||
static bool GPad_Check(int gamePadIndex, int portIndex);
|
||||
static void GPad_RefreshAll();
|
||||
static void GPad_UpdateAll();
|
||||
static void IN_GamePadsMove();
|
||||
static void IN_Frame_Hk();
|
||||
|
||||
static void Gamepad_WriteBindings(int gamePadIndex, int handle);
|
||||
static void Key_WriteBindings_Hk(int localClientNum, int handle);
|
||||
static void Com_WriteConfiguration_Modified_Stub();
|
||||
static void Gamepad_WriteBindings(int gamePadIndex, int handle);
|
||||
static void Key_WriteBindings_Hk(int localClientNum, int handle);
|
||||
static void Com_WriteConfiguration_Modified_Stub();
|
||||
|
||||
static void Gamepad_BindAxis(int gamePadIndex, Game::GamepadPhysicalAxis realIndex, Game::GamepadVirtualAxis axisIndex, Game::GamepadMapping mapType);
|
||||
static Game::GamepadPhysicalAxis StringToPhysicalAxis(const char* str);
|
||||
static Game::GamepadVirtualAxis StringToVirtualAxis(const char* str);
|
||||
static Game::GamepadMapping StringToGamePadMapping(const char* str);
|
||||
static void Axis_Bind_f(Command::Params* params);
|
||||
static void Axis_Unbindall_f(Command::Params* params);
|
||||
static void Bind_GP_SticksConfigs_f(Command::Params* params);
|
||||
static void Bind_GP_ButtonsConfigs_f(Command::Params* params);
|
||||
static void Scores_Toggle_f(Command::Params* params);
|
||||
static void Gamepad_BindAxis(int gamePadIndex, Game::GamepadPhysicalAxis realIndex, Game::GamepadVirtualAxis axisIndex, Game::GamepadMapping mapType);
|
||||
static Game::GamepadPhysicalAxis StringToPhysicalAxis(const char* str);
|
||||
static Game::GamepadVirtualAxis StringToVirtualAxis(const char* str);
|
||||
static Game::GamepadMapping StringToGamePadMapping(const char* str);
|
||||
static void Axis_Bind_f(Command::Params* params);
|
||||
static void Axis_Unbindall_f(Command::Params* params);
|
||||
static void Bind_GP_SticksConfigs_f(Command::Params* params);
|
||||
static void Bind_GP_ButtonsConfigs_f(Command::Params* params);
|
||||
static void Scores_Toggle_f(Command::Params* params);
|
||||
|
||||
static void InitDvars();
|
||||
static void CG_RegisterDvars_Hk();
|
||||
static void InitDvars();
|
||||
static void CG_RegisterDvars_Hk();
|
||||
|
||||
static const char* GetGamePadCommand(const char* command);
|
||||
static int Key_GetCommandAssignmentInternal_Hk(const char* cmd, int(*keys)[2]);
|
||||
static bool IsGamePadInUse();
|
||||
static void CL_KeyEvent_Hk(int localClientNum, int key, int down, unsigned int time);
|
||||
static int CL_MouseEvent_Hk(int x, int y, int dx, int dy);
|
||||
static bool UI_RefreshViewport_Hk();
|
||||
static const char* GetGamePadCommand(const char* command);
|
||||
static int Key_GetCommandAssignmentInternal_Hk(const char* cmd, int(*keys)[2]);
|
||||
static bool IsGamePadInUse();
|
||||
static void CL_KeyEvent_Hk(int localClientNum, int key, int down, unsigned int time);
|
||||
static int CL_MouseEvent_Hk(int x, int y, int dx, int dy);
|
||||
static bool UI_RefreshViewport_Hk();
|
||||
|
||||
static Game::keyname_t* GetLocalizedKeyNameMap();
|
||||
static void GetLocalizedKeyName_Stub();
|
||||
static void CreateKeyNameMap();
|
||||
};
|
||||
static Game::keyname_t* GetLocalizedKeyNameMap();
|
||||
static void GetLocalizedKeyName_Stub();
|
||||
static void CreateKeyNameMap();
|
||||
};
|
||||
}
|
||||
|
||||
@ -146,7 +146,6 @@ namespace Components
|
||||
{
|
||||
Utils::Hook(0x475E65, RawMouse::IN_MouseMove, HOOK_JUMP).install()->quick();
|
||||
Utils::Hook(0x475E8D, RawMouse::IN_MouseMove, HOOK_JUMP).install()->quick();
|
||||
Utils::Hook(0x475E9E, RawMouse::IN_MouseMove, HOOK_JUMP).install()->quick();
|
||||
|
||||
Utils::Hook(0x467C03, RawMouse::IN_Init, HOOK_CALL).install()->quick();
|
||||
Utils::Hook(0x64D095, RawMouse::IN_Init, HOOK_JUMP).install()->quick();
|
||||
|
||||
@ -6,6 +6,9 @@ namespace Components
|
||||
{
|
||||
public:
|
||||
RawMouse();
|
||||
|
||||
static void IN_MouseMove();
|
||||
|
||||
private:
|
||||
static Dvar::Var M_RawInput;
|
||||
static int MouseRawX, MouseRawY;
|
||||
@ -15,6 +18,5 @@ namespace Components
|
||||
static void IN_RawMouseMove();
|
||||
static void IN_RawMouse_Init();
|
||||
static void IN_Init();
|
||||
static void IN_MouseMove();
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user