From e99dce153c372774e9fbf3c4026f755ccaa74e12 Mon Sep 17 00:00:00 2001 From: skarockoi Date: Tue, 28 Feb 2023 16:22:58 +0100 Subject: [PATCH] seperated keybinds and worldinfo --- pHake/main.cpp | 51 ++++++++++++++++++++------------------ pHake/pLib/Ui/pOverlay.cpp | 4 +-- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/pHake/main.cpp b/pHake/main.cpp index 4272b29..d1b6929 100644 --- a/pHake/main.cpp +++ b/pHake/main.cpp @@ -110,38 +110,41 @@ bool Start() menu->Add(boostplayer); menu->Add(suicide); - std::unique_ptr thread = std::make_unique([&]() // extra thread needed to update world info and key toggles + std::unique_ptr world_thread = std::make_unique([&]() // extra thread needed to update world info and key toggles { world->UpdateAll(process->read(settings->pointers.world)); settings->kmh = 3.6f * process->read(settings->pointers.kmh); + }, 1); - GetKeyExecuteWaitForRelease(settings->keys.menu, [=]() - { - menu->ui->Toggle(); - }); - GetKeyExecuteWaitForRelease(settings->keys.teleport, [=]() - { - teleport->Execute(); - }); - - GetKeyExecuteWaitForRelease(settings->keys.boost_player, [=]() - { - boostplayer->Execute(); - }); - - GetKeyExecuteWaitForRelease(settings->keys.boost_vehicle, [=]() - { - boostvehicle->Execute(); - }); - - if (settings->noclip) + std::unique_ptr toggles_thread = std::make_unique([&]() // extra thread needed for keyboard toggles { - GetKeyExecuteWaitForRelease(VK_SPACE, [=]() + GetKeyExecuteWaitForRelease(settings->keys.menu, [=]() + { + menu->ui->Toggle(); + }); + GetKeyExecuteWaitForRelease(settings->keys.teleport, [=]() + { + teleport->Execute(); + }); + + GetKeyExecuteWaitForRelease(settings->keys.boost_player, [=]() { boostplayer->Execute(); }); - } - }, 1); + + GetKeyExecuteWaitForRelease(settings->keys.boost_vehicle, [=]() + { + boostvehicle->Execute(); + }); + + if (settings->noclip) + { + GetKeyExecuteWaitForRelease(VK_SPACE, [=]() + { + boostplayer->Execute(); + }); + } + }, 10); menu->Start(); diff --git a/pHake/pLib/Ui/pOverlay.cpp b/pHake/pLib/Ui/pOverlay.cpp index 3fe6ce1..456bda0 100644 --- a/pHake/pLib/Ui/pOverlay.cpp +++ b/pHake/pLib/Ui/pOverlay.cpp @@ -70,11 +70,11 @@ void pOverlay::Create(LPCSTR Name) notification.Create(&window_); mouse_.Create(&window_); - mouse_.Toggle(); list.Create(&window_); list.position(sf::Vector2f(window_.getSize().x / 2, window_.getSize().y / 4)); - list.Toggle(); + + this->Toggle(); } void pOverlay::Toggle()