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

Remove unused outdated xpad dvars for gamepad

Browse Source
This commit is contained in:
Jan 2021-08-30 19:29:41 +02:00
parent 2d81e51a05
commit 925eb1d0a9
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,13 +193,6 @@ namespace Components
Dvar::Var Gamepad::aim_lockon_pitch_strength; Dvar::Var Gamepad::aim_lockon_pitch_strength;
Dvar::Var Gamepad::aim_lockon_strength; Dvar::Var Gamepad::aim_lockon_strength;
Dvar::Var Gamepad::xpadSensitivity;
Dvar::Var Gamepad::xpadEarlyTime;
Dvar::Var Gamepad::xpadEarlyMultiplier;
Dvar::Var Gamepad::xpadHorizontalMultiplier;
Dvar::Var Gamepad::xpadVerticalMultiplier;
Dvar::Var Gamepad::xpadAdsMultiplier;
struct ControllerMenuKeyMapping struct ControllerMenuKeyMapping
{ {
Game::keyNum_t controllerKey; Game::keyNum_t controllerKey;
@ -803,7 +796,7 @@ namespace Components
return static_cast<char>(std::clamp<int>(value, std::numeric_limits<char>::min(), std::numeric_limits<char>::max())); return static_cast<char>(std::clamp<int>(value, std::numeric_limits<char>::min(), std::numeric_limits<char>::max()));
} }
void Gamepad::CL_GamepadMove(const int gamePadIndex, Game::usercmd_s* cmd, const float frame_time_base) void Gamepad::CL_GamepadMove(const int gamePadIndex, Game::usercmd_s* cmd, const float frameTimeBase)
{ {
assert(gamePadIndex < Game::MAX_GAMEPADS); assert(gamePadIndex < Game::MAX_GAMEPADS);
auto& gamePad = gamePads[gamePadIndex]; auto& gamePad = gamePads[gamePadIndex];
@ -841,7 +834,7 @@ namespace Components
{ {
Game::AimInput aimInput{}; Game::AimInput aimInput{};
Game::AimOutput aimOutput{}; Game::AimOutput aimOutput{};
aimInput.deltaTime = frame_time_base; aimInput.deltaTime = frameTimeBase;
aimInput.buttons = cmd->buttons; aimInput.buttons = cmd->buttons;
aimInput.localClientNum = gamePadIndex; aimInput.localClientNum = gamePadIndex;
aimInput.deltaTimeScaled = static_cast<float>(Game::cls->frametime) * 0.001f; aimInput.deltaTimeScaled = static_cast<float>(Game::cls->frametime) * 0.001f;
@ -862,7 +855,6 @@ namespace Components
} }
constexpr auto CL_MouseMove = 0x5A6240; constexpr auto CL_MouseMove = 0x5A6240;
__declspec(naked) void Gamepad::CL_MouseMove_Stub() __declspec(naked) void Gamepad::CL_MouseMove_Stub()
{ {
__asm __asm

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

@ -323,13 +323,6 @@ namespace Components
static Dvar::Var aim_lockon_pitch_strength; static Dvar::Var aim_lockon_pitch_strength;
static Dvar::Var aim_lockon_strength; static Dvar::Var aim_lockon_strength;
static Dvar::Var xpadSensitivity;
static Dvar::Var xpadEarlyTime;
static Dvar::Var xpadEarlyMultiplier;
static Dvar::Var xpadHorizontalMultiplier;
static Dvar::Var xpadVerticalMultiplier;
static Dvar::Var xpadAdsMultiplier;
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);
@ -358,7 +351,7 @@ namespace Components
static bool CG_ShouldUpdateViewAngles(int localClientNum); static bool CG_ShouldUpdateViewAngles(int localClientNum);
static float CL_GamepadAxisValue(int gamePadIndex, Game::GamepadVirtualAxis virtualAxis); static float CL_GamepadAxisValue(int gamePadIndex, Game::GamepadVirtualAxis virtualAxis);
static char ClampChar(int value); static char ClampChar(int value);
static void CL_GamepadMove(int gamePadIndex, Game::usercmd_s* cmd, float frame_time_base); static void CL_GamepadMove(int gamePadIndex, Game::usercmd_s* cmd, float frameTimeBase);
static void CL_MouseMove_Stub(); static void CL_MouseMove_Stub();
static bool Key_IsValidGamePadChar(int key); static bool Key_IsValidGamePadChar(int key);