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

Better dvar handling

Browse Source
This commit is contained in:
Louvenarde 2021-08-14 13:51:22 +02:00
parent cbfdde2029
commit 0f8acb940e
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Loader.cpp
View File

@ -101,9 +101,9 @@ namespace Components
Loader::Register(new StructuredData());
Loader::Register(new ConnectProtocol());
Loader::Register(new StartupMessages());
Loader::Register(new XInput());
Loader::Register(new Client());
Loader::Register(new XInput());
Loader::Pregame = false;
}

33
src/Components/Modules/XInput.cpp
View File

@ -12,6 +12,13 @@ namespace Components
bool XInput::isHoldingMaxLookX = false;
bool XInput::isADS;
Dvar::Var XInput::xpadSensitivity;
Dvar::Var XInput::xpadEarlyTime;
Dvar::Var XInput::xpadEarlyMultiplier;
Dvar::Var XInput::xpadHorizontalMultiplier;
Dvar::Var XInput::xpadVerticalMultiplier;
Dvar::Var XInput::xpadAdsMultiplier;
float XInput::lastMenuNavigationDirection = .0f;
std::chrono::milliseconds XInput::lastNavigationTime = 0ms;
std::chrono::milliseconds XInput::msBetweenNavigations = 220ms;
@ -380,12 +387,12 @@ namespace Components
{
XINPUT_STATE* xiState = &xiStates[xiPlayerNum];
float viewSensitivityMultiplier = Dvar::Var("xpad_sensitivity").get<float>() * XINPUT_SENSITIVITY_MULTIPLIER;
float viewSensitivityMultiplier = xpadSensitivity.get<float>() * XINPUT_SENSITIVITY_MULTIPLIER;
float lockedSensitivityMultiplier = Dvar::Var("xpad_early_multiplier").get<float>();
float generalXSensitivityMultiplier = Dvar::Var("xpad_horizontal_multiplier").get<float>();
float generalYSensitivityMultiplier = Dvar::Var("xpad_vertical_multiplier").get<float>();
std::chrono::milliseconds msBeforeUnlockingSensitivity = std::chrono::milliseconds(Dvar::Var("xpad_early_time").get<int>());
float lockedSensitivityMultiplier = xpadEarlyMultiplier.get<float>();
float generalXSensitivityMultiplier = xpadHorizontalMultiplier.get<float>();
float generalYSensitivityMultiplier = xpadVerticalMultiplier.get<float>();
std::chrono::milliseconds msBeforeUnlockingSensitivity = std::chrono::milliseconds(xpadEarlyTime.get<int>());
float viewStickX, viewStickY;
GetRightStick01Value(xiState, viewStickX, viewStickY);
@ -416,8 +423,6 @@ namespace Components
XInput::isHoldingMaxLookX = false;
XInput::timeAtFirstHeldMaxLookX = 0ms;
viewStickX *= lockedSensitivityMultiplier;
Components::Logger::Print("multiplier will be %f\n", lockedSensitivityMultiplier);
}
float adsMultiplier = 1.0f;
@ -426,7 +431,7 @@ namespace Components
// DO NOT use clientActive->usingAds ! It only works for toggle ADS
if (Game::PM_IsAdsAllowed(ps) && XInput::isADS) {
adsMultiplier = Dvar::Var("xpad_ads_multiplier").get<float>();
adsMultiplier = xpadAdsMultiplier.get<float>();
}
if (viewStickX != 0 || viewStickY != 0) {
@ -512,12 +517,12 @@ namespace Components
Utils::Hook(0x5A6816, CL_GetMouseMovementStub, HOOK_CALL).install()->quick();
Utils::Hook(0x5A6829, unk_CheckKeyHook, HOOK_CALL).install()->quick();
Game::Dvar_RegisterFloat("xpad_sensitivity", 1.9f, 0.1f, 10.0f, Game::DVAR_FLAG_SAVED, "View sensitivity for XInput-compatible gamepads");
Game::Dvar_RegisterInt("xpad_early_time", 130, 0, 1000, Game::DVAR_FLAG_SAVED, "Time (in milliseconds) of reduced view sensitivity");
Game::Dvar_RegisterFloat("xpad_early_multiplier", 0.25f, 0.01f, 1.0f, Game::DVAR_FLAG_SAVED, "By how much the view sensitivity is multiplied during xpad_early_time when moving the view stick");
Game::Dvar_RegisterFloat("xpad_horizontal_multiplier", 1.5f, 1.0f, 20.0f, Game::DVAR_FLAG_SAVED, "Horizontal view sensitivity multiplier");
Game::Dvar_RegisterFloat("xpad_vertical_multiplier", 0.8f, 1.0f, 20.0f, Game::DVAR_FLAG_SAVED, "Vertical view sensitivity multiplier");
Game::Dvar_RegisterFloat("xpad_ads_multiplier", 0.7f, 0.1f, 1.0f, Game::DVAR_FLAG_SAVED, "By how much the view sensitivity is multiplied when aiming down the sights.");
XInput::xpadSensitivity = Dvar::Register<float>("xpad_sensitivity", 1.9f, 0.1f, 10.0f, Game::DVAR_FLAG_SAVED, "View sensitivity for XInput-compatible gamepads");
XInput::xpadEarlyTime = Dvar::Register<int>("xpad_early_time", 130, 0, 1000, Game::DVAR_FLAG_SAVED, "Time (in milliseconds) of reduced view sensitivity");
XInput::xpadEarlyMultiplier = Dvar::Register<float>("xpad_early_multiplier", 0.25f, 0.01f, 1.0f, Game::DVAR_FLAG_SAVED, "By how much the view sensitivity is multiplied during xpad_early_time when moving the view stick");
XInput::xpadHorizontalMultiplier = Dvar::Register<float>("xpad_horizontal_multiplier", 1.5f, 1.0f, 20.0f, Game::DVAR_FLAG_SAVED, "Horizontal view sensitivity multiplier");
XInput::xpadVerticalMultiplier = Dvar::Register<float>("xpad_vertical_multiplier", 0.8f, 1.0f, 20.0f, Game::DVAR_FLAG_SAVED, "Vertical view sensitivity multiplier");
XInput::xpadAdsMultiplier = Dvar::Register<float>("xpad_ads_multiplier", 0.7f, 0.1f, 1.0f, Game::DVAR_FLAG_SAVED, "By how much the view sensitivity is multiplied when aiming down the sights.");
PollXInputDevices();

7
src/Components/Modules/XInput.hpp
View File

@ -48,6 +48,13 @@ namespace Components
static std::chrono::milliseconds msBetweenNavigations;
static float lastMenuNavigationDirection;
static Dvar::Var XInput::xpadSensitivity;
static Dvar::Var XInput::xpadEarlyTime;
static Dvar::Var XInput::xpadEarlyMultiplier;
static Dvar::Var XInput::xpadHorizontalMultiplier;
static Dvar::Var XInput::xpadVerticalMultiplier;
static Dvar::Var XInput::xpadAdsMultiplier;
static void CL_GetMouseMovementCl(Game::clientActive_t* result, float* mx, float* my);
static int unk_CheckKeyHook(int localClientNum, Game::keyNum_t keyCode);