clang-format, add to menu and other changes

This commit is contained in:
TotallyNotElite 2018-06-11 12:32:53 +02:00
parent 9b5073bbfa
commit 62ec2a8e56
2 changed files with 39 additions and 28 deletions

View File

@ -7,57 +7,61 @@ namespace shared
namespace lightesp namespace lightesp
{ {
CatVar enable(CV_SWITCH, "lightesp_enabled", "0", "Enable LightESP",
CatVar enable(CV_SWITCH, "lightesp", "0", "Enable LightESP",
"Lightweight ESP. Only shows head."); "Lightweight ESP. Only shows head.");
Vector hitp[32]; Vector hitp[32];
Vector minp[32]; Vector minp[32];
Vector maxp[32]; Vector maxp[32];
bool drawEsp[32];
void run() { void run()
{
for (int i = 1; i < g_IEngine->GetMaxClients(); i++) for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
{ {
CachedEntity *pEntity = ENTITY(i); CachedEntity *pEntity = ENTITY(i);
if (CE_BAD(pEntity) || !pEntity->m_bAlivePlayer()) { if (CE_BAD(pEntity) || !pEntity->m_bAlivePlayer())
hitp[i] = {0, 0, 0}; {
drawEsp[i] = false;
continue; continue;
} }
if (pEntity->m_iTeam() == LOCAL_E->m_iTeam() && playerlist::IsDefault(pEntity)) { if (pEntity->m_iTeam() == LOCAL_E->m_iTeam() &&
hitp[i] = {0, 0, 0}; playerlist::IsDefault(pEntity))
{
drawEsp[i] = false;
continue; continue;
} }
if (!pEntity->hitboxes.GetHitbox(0)) if (!pEntity->hitboxes.GetHitbox(0))
continue; continue;
hitp[i] = pEntity->hitboxes.GetHitbox(0)->center; hitp[i] = pEntity->hitboxes.GetHitbox(0)->center;
minp[i] = pEntity->hitboxes.GetHitbox(0)->min; minp[i] = pEntity->hitboxes.GetHitbox(0)->min;
maxp[i] = pEntity->hitboxes.GetHitbox(0)->max; maxp[i] = pEntity->hitboxes.GetHitbox(0)->max;
drawEsp[i] = true;
} }
} }
void draw() { void draw()
#if ENABLE_VISUALS {
#if ENABLE_VISUALS
if (!enable) if (!enable)
return; return;
for (int i = 1; i < g_IEngine->GetMaxClients(); i++) { for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
{
if (!drawEsp[i])
continue;
CachedEntity *pEntity = ENTITY(i); CachedEntity *pEntity = ENTITY(i);
if (CE_BAD(pEntity) || !pEntity->m_bAlivePlayer()) if (CE_BAD(pEntity) || !pEntity->m_bAlivePlayer())
continue; continue;
auto hitboxpos = hitp[i];
auto min = minp[i];
auto max = maxp[i];
if (!hitboxpos.x && !hitboxpos.y && !hitboxpos.z)
continue;
Vector out; Vector out;
if (draw::WorldToScreen(hitboxpos, out)) if (draw::WorldToScreen(hitp[i], out))
{ {
float size = 0.0f; float size;
if (abs(max.x - min.x) > abs(max.y - min.y)) if (abs(maxp[i].x - minp[i].x) > abs(maxp[i].y - minp[i].y))
size = abs(max.x - min.x); size = abs(maxp[i].x - minp[i].x);
else else
size = abs(max.y - min.y); size = abs(maxp[i].y - minp[i].y);
draw_api::draw_rect(out.x, out.y, size / 4, size / 4, draw_api::draw_rect(
hacks::shared::lightesp::LightESPColor(pEntity)); //hacks::shared::lightesp::LightESPColor(pEntity) out.x, out.y, size / 4, size / 4,
hacks::shared::lightesp::LightESPColor(pEntity));
} }
} }
#endif #endif
@ -65,9 +69,12 @@ void draw() {
rgba_t LightESPColor(CachedEntity *ent) rgba_t LightESPColor(CachedEntity *ent)
{ {
if (!playerlist::IsDefault(ent)) { if (!playerlist::IsDefault(ent))
{
return playerlist::Color(ent); return playerlist::Color(ent);
} }
return colors::green; return colors::green;
} }
}}} }
}
}

View File

@ -198,6 +198,10 @@ static const std::string list_hl2dm = R"(
"glow_medkits" "glow_medkits"
"glow_ammo" "glow_ammo"
] ]
"LightESP" [
"LightESP Menu"
"lightesp_enabled"
]
"GUI" [ "GUI" [
"GUI Settings" "GUI Settings"
"logo" "logo"