Merge remote-tracking branch 'nullworks/newui' into Pathfinder

This commit is contained in:
TotallyNotElite 2018-08-18 20:10:42 +02:00
commit c902ebad1e
4 changed files with 33 additions and 23 deletions

View File

@ -38,7 +38,7 @@ void CreateMove()
return;
// Check if player is using a flame thrower
if (g_pLocalPlayer->weapon()->m_iClassID() != CL_CLASS(CTFFlameThrower))
if (g_pLocalPlayer->weapon()->m_iClassID() != CL_CLASS(CTFFlameThrower) && CE_INT(LOCAL_W, netvar.iItemDefinitionIndex) != 528)
return;
// Check for phlogistinator, which is item 594

View File

@ -259,14 +259,19 @@ bool ValidTick(BacktrackData &i, CachedEntity *ent)
return true;
if (istickinvalid[ent->m_IDX][i.index])
return false;
if (!hacks::shared::aimbot::IsBacktracking() ||
IsVectorVisible(g_pLocalPlayer->v_Eye, i.hitboxes[head].center, true))
if (fabsf(NET_FLOAT(RAW_ENT(ent), netvar.m_flSimulationTime) * 1000.0f -
getLatency() - i.simtime * 1000.0f) <= 200.0f)
{
istickvalid[ent->m_IDX][i.index] = true;
return true;
}
if (hacks::shared::aimbot::IsBacktracking()) {
if (IsVectorVisible(g_pLocalPlayer->v_Eye, i.hitboxes[head].center, true))
if (fabsf(NET_FLOAT(RAW_ENT(ent), netvar.m_flSimulationTime) * 1000.0f -
getLatency() - i.simtime * 1000.0f) <= 200.0f) {
istickvalid[ent->m_IDX][i.index] = true;
return true;
}
}
else if (fabsf(NET_FLOAT(RAW_ENT(ent), netvar.m_flSimulationTime) * 1000.0f -
getLatency() - i.simtime * 1000.0f) <= 200.0f) {
istickvalid[ent->m_IDX][i.index] = true;
return true;
}
istickinvalid[ent->m_IDX][i.index] = true;
return false;
}

View File

@ -34,7 +34,7 @@ namespace hooked_methods
DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
bf_read &buf)
{
if (retrun && gitgud.test_and_set(10000))
if (retrun && gitgud.test_and_set(100))
{
PrintChat("\x07%06X%s\x01: %s", 0xe05938, lastname.c_str(),
lastfilter.c_str());
@ -175,8 +175,6 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
boost::replace_all(message2, "7", "t");
for (auto filter : res)
{
if (retrun)
break;
if (boost::contains(message2, filter))
{
*bSendPackets = true;
@ -184,6 +182,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
retrun = true;
lastfilter = format(filter);
lastname = format(name);
gitgud.update();
}
}
}
@ -211,6 +210,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
retrun = true;
lastfilter = format(filter);
lastname = format(name);
gitgud.update();
}
}
}

View File

@ -11,22 +11,27 @@ namespace hooked_methods
DEFINE_HOOKED_METHOD(SendDatagram, int, INetChannel *ch, bf_write *buf)
{
#if !LAGBOT_MODE
int in = ch->m_nInSequenceNr;
auto state = ch->m_nInReliableState;
int in;
int state;
if (CE_GOOD(LOCAL_E)) {
in = ch->m_nInSequenceNr;
state = ch->m_nInReliableState;
float latencysend =
round((round((hacks::shared::backtrack::getLatency() - 0.5f) /
15.1515151515f) -
0.5f) *
15.1515151515f);
hacks::shared::backtrack::AddLatencyToNetchan(ch, latencysend);
float latencysend =
round((round((hacks::shared::backtrack::getLatency() - 0.5f) /
15.1515151515f) -
0.5f) *
15.1515151515f);
hacks::shared::backtrack::AddLatencyToNetchan(ch, latencysend);
}
#endif
int ret = original::SendDatagram(ch, buf);
#if !LAGBOT_MODE
ch->m_nInSequenceNr = in;
ch->m_nInReliableState = state;
if (CE_GOOD(LOCAL_E)) {
ch->m_nInSequenceNr = in;
ch->m_nInReliableState = state;
}
#endif
return ret;