Merge remote-tracking branch 'nullworks/newui'

This commit is contained in:
TotallyNotElite 2018-08-10 23:24:27 +02:00
commit 9b8cb223a8
2 changed files with 8 additions and 6 deletions

View File

@ -91,20 +91,22 @@ AimbotCalculatedData_s calculated_data_array[2048]{};
#define IsMelee GetWeaponMode() == weapon_melee #define IsMelee GetWeaponMode() == weapon_melee
bool BacktrackAimbot() bool BacktrackAimbot()
{ {
if (!hacks::shared::backtrack::isBacktrackEnabled() || !backtrackAimbot) if (!hacks::shared::backtrack::isBacktrackEnabled() || !*backtrackAimbot)
return false; return false;
if (aimkey && !aimkey.isKeyDown()) if (aimkey && !aimkey.isKeyDown())
return false; return true;
if (CE_BAD(LOCAL_E) || !LOCAL_E->m_bAlivePlayer() || !CanShoot()) if (CE_BAD(LOCAL_E) || !LOCAL_E->m_bAlivePlayer() || !CanShoot())
return false; return true;
if (zoomed_only && !g_pLocalPlayer->bZoomed && if (*zoomed_only && !g_pLocalPlayer->bZoomed &&
!(current_user_cmd->buttons & IN_ATTACK)) !(current_user_cmd->buttons & IN_ATTACK))
return false; return true;
int iBestTarget = hacks::shared::backtrack::iBestTarget; int iBestTarget = hacks::shared::backtrack::iBestTarget;
if (iBestTarget == -1) if (iBestTarget == -1)
return true; return true;
int tickcnt = 0;
CachedEntity *tar = ENTITY(iBestTarget); CachedEntity *tar = ENTITY(iBestTarget);
if (CE_BAD(tar)) if (CE_BAD(tar))
return false; return false;

View File

@ -67,7 +67,7 @@ bool unifiedCanBackstab(Vector &vecAngle, Vector min, Vector max,
// Get melee range // Get melee range
float meleeRange = re::C_TFWeaponBaseMelee::GetSwingRange(RAW_ENT(LOCAL_W)); float meleeRange = re::C_TFWeaponBaseMelee::GetSwingRange(RAW_ENT(LOCAL_W));
if (fabsf(vecAngle.y - if (fabsf(vecAngle.y -
NET_VECTOR(RAW_ENT(besttarget), netvar.m_angEyeAngles).y) >= 60) NET_VECTOR(RAW_ENT(besttarget), netvar.m_angEyeAngles).y) >= 50)
return false; return false;
if (!min.x && !max.x) if (!min.x && !max.x)
return false; return false;