Backups/Amalgam
1
0
Fork 0
mirror of https://github.com/rei-2/Amalgam synced 2026-10-10 12:53:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc antiaim changes

Browse Source
This commit is contained in:
rei-2
2024-10-29 06:52:01 -04:00
parent ef70c2d0d7
commit 9e5a7d67f3
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amalgam/src/Features/PacketManip/AntiAim/AntiAim.cpp
+2 -2
View File
@@ -198,10 +198,10 @@ void CAntiAim::MinWalk(CTFPlayer* pLocal, CUserCmd* pCmd, bool bSendPacket)
if (!Vars::AntiHack::AntiAim::MinWalk.Value || !F::AntiAim.YawOn() || G::DoubleTap || !pLocal->m_hGroundEntity() || pLocal->IsInBumperKart())
return;
static bool bVar = true;
if (!pCmd->forwardmove && !pCmd->sidemove && pLocal->m_vecVelocity().Length2D() < 10.f)
{
float flMove = (pLocal->IsDucking() ? 14.f : 1.f) * ((bVar = !bVar) ? 1 : -1);
static bool bVar = true;
float flMove = (pLocal->IsDucking() ? 3 : 1) * ((bVar = !bVar) ? 1 : -1);
Vec3 vDir = { flMove, flMove, 0 };
Vec3 vMove = Math::RotatePoint(vDir, {}, { 0, -pCmd->viewangles.y, 0 });
Amalgam/src/Features/PacketManip/AntiAim/AntiAim.h
+2
View File
@@ -23,6 +23,8 @@ public:
int GetEdge(CTFPlayer* pEntity, float flEdgeOrigYaw, bool bUpPitch);
void Run(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserCmd* pCmd, bool bSendPacket);
inline int AntiAimTicks() { return 3; }
Vec2 vFakeAngles = {};
Vec2 vRealAngles = {};
std::vector<std::pair<Vec3, Vec3>> vEdgeTrace = {};
Amalgam/src/Features/PacketManip/PacketManip.cpp
+2 -1
View File
@@ -4,7 +4,8 @@
static inline bool AntiAimCheck(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserCmd* pCmd)
{
return F::AntiAim.YawOn() && F::AntiAim.ShouldRun(pLocal, pWeapon, pCmd) && I::ClientState->chokedcommands < 3 && !G::Recharge;
return F::AntiAim.YawOn() && F::AntiAim.ShouldRun(pLocal, pWeapon, pCmd) && !G::Recharge
&& I::ClientState->chokedcommands < F::AntiAim.AntiAimTicks();
}
void CPacketManip::Run(CTFPlayer* pLocal, CTFWeaponBase* pWeapon, CUserCmd* pCmd, bool* pSendPacket)
Amalgam/src/Features/TickHandler/TickHandler.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void CTickshiftHandler::MoveMain(float accumulated_extra_samples, bool bFinalTic
static auto sv_maxusrcmdprocessticks = U::ConVars.FindVar("sv_maxusrcmdprocessticks");
G::MaxShift = sv_maxusrcmdprocessticks ? sv_maxusrcmdprocessticks->GetInt() : 24;
if (F::AntiAim.YawOn())
G::MaxShift -= 3;
G::MaxShift -= F::AntiAim.AntiAimTicks();
while (G::ShiftedTicks > G::MaxShift)
CLMoveFunc(accumulated_extra_samples, false); // skim any excess ticks