diff --git a/NEPS/Config.cpp b/NEPS/Config.cpp index a762a8c3..16e90760 100644 --- a/NEPS/Config.cpp +++ b/NEPS/Config.cpp @@ -708,7 +708,6 @@ static void from_json(const json &j, Config::Griefing &g) read(j, "Ban text", g.banText); read(j, "Reportbot", g.reportbot); read(j, "Blockbot", g.blockbot); - read(j, "Fake prime", g.fakePrime); read(j, "Vote reveal", g.revealVotes); read(j, "Spam use", g.spamUse); } @@ -1193,7 +1192,6 @@ static void to_json(json &j, const Config::Griefing &o) WRITE("Ban text", banText); WRITE("Reportbot", reportbot); WRITE("Blockbot", blockbot); - WRITE("Fake prime", fakePrime); WRITE("Vote reveal", revealVotes); WRITE("Spam use", spamUse); } @@ -1460,7 +1458,7 @@ void Config::listConfigs() noexcept std::error_code ec; std::transform(std::filesystem::directory_iterator{path, ec}, - std::filesystem::directory_iterator{ }, + std::filesystem::directory_iterator{}, std::back_inserter(configs), [](const auto &entry) { return std::string{(const char *)entry.path().filename().u8string().c_str()}; }); } diff --git a/NEPS/Config.h b/NEPS/Config.h index 383277db..d361bbb6 100644 --- a/NEPS/Config.h +++ b/NEPS/Config.h @@ -14,20 +14,25 @@ class Config { public: explicit Config(const char *) noexcept; + bool load(const char8_t *name, bool incremental) noexcept; - bool load(size_t, bool incremental) noexcept; - void save(size_t) const noexcept; + bool load(std::size_t, bool incremental) noexcept; + void save(std::size_t) const noexcept; void add(const char *) noexcept; - void remove(size_t) noexcept; - void rename(size_t, const char *) noexcept; + void remove(std::size_t) noexcept; + void rename(std::size_t, const char *) noexcept; void reset() noexcept; void listConfigs() noexcept; void openConfigDir() const noexcept; - constexpr auto &getConfigs() noexcept + constexpr auto &getConfigs() noexcept { return configs; } + + struct Font { - return configs; - } + ImFont *tiny; + ImFont *medium; + ImFont *big; + }; struct Aimbot { @@ -149,13 +154,6 @@ class Config std::unordered_map otherEntities; } esp; - struct Font - { - ImFont *tiny; - ImFont *medium; - ImFont *big; - }; - struct Visuals { bool disablePostProcessing = false; @@ -318,7 +316,6 @@ class Config { bool nameStealer = false; bool killMessage = false; - bool fakePrime = false; bool revealVotes = false; char clanTag[16] = "\0"; int animatedClanTag = 0; diff --git a/NEPS/GUI.cpp b/NEPS/GUI.cpp index 4df674c0..fcb6a62c 100644 --- a/NEPS/GUI.cpp +++ b/NEPS/GUI.cpp @@ -2073,7 +2073,6 @@ void GUI::renderGriefingWindow(bool contentOnly) noexcept if (ImGui::Button("Fake ban", ImVec2{75.0f, 0.0f})) Misc::fakeBan(true); - ImGui::Checkbox("Fake prime", &config->griefing.fakePrime); ImGui::Checkbox("Vote reveal", &config->griefing.revealVotes); ImGui::Checkbox("Name stealer", &config->griefing.nameStealer); ImGui::Checkbox("Clock tag", &config->griefing.clocktag); diff --git a/NEPS/Hacks/Misc.cpp b/NEPS/Hacks/Misc.cpp index d5cc5b4b..4d3b2d36 100644 --- a/NEPS/Hacks/Misc.cpp +++ b/NEPS/Hacks/Misc.cpp @@ -937,23 +937,6 @@ void Misc::fixTabletSignal() noexcept } } -void Misc::fakePrime() noexcept -{ - static bool lastState = false; - - if (config->griefing.fakePrime != lastState) - { - lastState = config->griefing.fakePrime; - - if (DWORD oldProtect; VirtualProtect(memory->fakePrime, 1, PAGE_EXECUTE_READWRITE, &oldProtect)) - { - constexpr uint8_t patch[]{0x74, 0xEB}; - *memory->fakePrime = patch[config->griefing.fakePrime]; - VirtualProtect(memory->fakePrime, 1, oldProtect, nullptr); - } - } -} - void Misc::killMessage(GameEvent &event) noexcept { if (!config->griefing.killMessage) diff --git a/NEPS/Hacks/Misc.h b/NEPS/Hacks/Misc.h index c833f07a..45024863 100644 --- a/NEPS/Hacks/Misc.h +++ b/NEPS/Hacks/Misc.h @@ -28,7 +28,6 @@ namespace Misc void changeConVarsFrame(FrameStage stage); void quickHealthshot(UserCmd *) noexcept; void fixTabletSignal() noexcept; - void fakePrime() noexcept; void killMessage(GameEvent &event) noexcept; void fixMovement(UserCmd *cmd, float yaw) noexcept; void antiAfkKick(UserCmd *cmd) noexcept; diff --git a/NEPS/Hooks.cpp b/NEPS/Hooks.cpp index 968d1219..02b0e55d 100644 --- a/NEPS/Hooks.cpp +++ b/NEPS/Hooks.cpp @@ -338,7 +338,6 @@ static void __stdcall frameStageNotify(FrameStage stage) noexcept Misc::fixAnimation(lastCmd, sentPacket); Misc::preserveKillfeed(); Visuals::colorWorld(); - Misc::fakePrime(); Misc::forceRelayCluster(); break; case FrameStage::RENDER_END: diff --git a/NEPS/Memory.cpp b/NEPS/Memory.cpp index 9ce12a53..3bd4e242 100644 --- a/NEPS/Memory.cpp +++ b/NEPS/Memory.cpp @@ -41,7 +41,6 @@ Memory::Memory() noexcept viewRender = **reinterpret_cast(findPattern("client", "\x8B\x0D????\xFF\x75\x0C\x8B\x45\x08") + 2); drawScreenEffectMaterial = relativeToAbsolute(findPattern("client", "\xE8????\x83\xC4\x0C\x8D\x4D\xF8") + 1); submitReport = reinterpret_cast(findPattern("client", "\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x28\x8B\x4D\x08")); - fakePrime = reinterpret_cast(findPattern("client", "\x17\xF6\x40\x14\x10") - 1); const auto tier0 = GetModuleHandleW(L"tier0"); debugMsg = reinterpret_cast(GetProcAddress(tier0, "Msg")); diff --git a/NEPS/Memory.h b/NEPS/Memory.h index eb947262..ec7ef82c 100644 --- a/NEPS/Memory.h +++ b/NEPS/Memory.h @@ -82,7 +82,6 @@ class Memory ViewRender *viewRender; uintptr_t drawScreenEffectMaterial; std::add_pointer_t submitReport; - uint8_t *fakePrime; std::add_pointer_t debugMsg; std::add_pointer_t &color, const char *msg, ...)> conColorMsg; float *vignette;