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

Remove aim assist premake configuration value again in favor of being able to disable aim assist using the server dvar

Browse Source
This commit is contained in:
Jan 2021-09-01 18:36:03 +02:00
parent 67bfad3ae7
commit 7e9f277ae9
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
premake5.lua
View File

@ -79,11 +79,6 @@ newoption {
description = "Zonebuilder generates iw4x zones that cannot be loaded without IW4x specific patches." description = "Zonebuilder generates iw4x zones that cannot be loaded without IW4x specific patches."
} }
newoption {
trigger = "aimassist-enable",
description = "Enables code for controller aim assist."
}
newaction { newaction {
trigger = "version", trigger = "version",
description = "Returns the version string for the current commit of the source code.", description = "Returns the version string for the current commit of the source code.",
@ -337,9 +332,6 @@ workspace "iw4x"
if _OPTIONS["iw4x-zones"] then if _OPTIONS["iw4x-zones"] then
defines { "GENERATE_IW4X_SPECIFIC_ZONES" } defines { "GENERATE_IW4X_SPECIFIC_ZONES" }
end end
if _OPTIONS["aimassist-enable"] then
defines { "AIM_ASSIST_ENABLED" }
end
-- Pre-compiled header -- Pre-compiled header
pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives

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

@ -437,8 +437,6 @@ namespace Components
void Gamepad::AimAssist_ApplyLockOn(const Game::AimInput* input, Game::AimOutput* output) void Gamepad::AimAssist_ApplyLockOn(const Game::AimInput* input, Game::AimOutput* output)
{ {
#ifdef AIM_ASSIST_ENABLED
assert(input); assert(input);
assert(input->localClientNum < Game::MAX_GAMEPADS); assert(input->localClientNum < Game::MAX_GAMEPADS);
auto& aaGlob = Game::aaGlobArray[input->localClientNum]; auto& aaGlob = Game::aaGlobArray[input->localClientNum];
@ -481,8 +479,6 @@ namespace Components
output->pitch -= pitchTurnRate * input->deltaTime; output->pitch -= pitchTurnRate * input->deltaTime;
output->yaw += yawTurnRate * input->deltaTime; output->yaw += yawTurnRate * input->deltaTime;
} }
#endif
} }
void Gamepad::AimAssist_CalcAdjustedAxis(const Game::AimInput* input, float* pitchAxis, float* yawAxis) void Gamepad::AimAssist_CalcAdjustedAxis(const Game::AimInput* input, float* pitchAxis, float* yawAxis)
@ -564,9 +560,7 @@ namespace Components
*pitchScale = 1.0f; *pitchScale = 1.0f;
*yawScale = 1.0f; *yawScale = 1.0f;
#ifdef AIM_ASSIST_ENABLED
if (!AimAssist_IsSlowdownActive(&aaGlob.ps)) if (!AimAssist_IsSlowdownActive(&aaGlob.ps))
return; return;
@ -582,8 +576,6 @@ namespace Components
if (AimAssist_IsPlayerUsingOffhand(&aaGlob.ps)) if (AimAssist_IsPlayerUsingOffhand(&aaGlob.ps))
*pitchScale = 1.0f; *pitchScale = 1.0f;
#endif
} }
float Gamepad::AimAssist_Lerp(const float from, const float to, const float fraction) float Gamepad::AimAssist_Lerp(const float from, const float to, const float fraction)