Merge pull request #259 from Laupetin/fix/gamepad-melee-charge

Fix knife charge not working anymore with gamepad patch enabled
This commit is contained in:
Edo 2022-05-07 09:46:25 -04:00 committed by GitHub
commit f13b3422ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -661,7 +661,8 @@ namespace Components
Game::AimAssist_UpdateAdsLerp(input);
AimAssist_ApplyTurnRates(input, output);
Game::AimAssist_ApplyAutoMelee(input, output);
// Automelee has already been done by keyboard so don't do it again
AimAssist_ApplyLockOn(input, output);
}
@ -886,8 +887,6 @@ namespace Components
AimAssist_UpdateGamePadInput(&aimInput, &aimOutput);
clientActive.clViewangles[0] = aimOutput.pitch;
clientActive.clViewangles[1] = aimOutput.yaw;
cmd->meleeChargeDist = aimOutput.meleeChargeDist;
cmd->meleeChargeYaw = aimOutput.meleeChargeYaw;
}
}