ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

refactor(CmdExecutor): closing the executor window (#1240)

Browse Source
This commit is contained in:
Andreas Maerten 2023-04-15 21:00:22 +02:00 committed by GitHub
parent e138e2fa11
commit 080ffeb647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui.cpp
View File

@ -4,7 +4,6 @@
#include "natives.hpp" #include "natives.hpp"
#include "renderer.hpp" #include "renderer.hpp"
#include "script.hpp" #include "script.hpp"
#include "util/is_key_pressed.hpp"
#include "views/view.hpp" #include "views/view.hpp"
#include <imgui.h> #include <imgui.h>
@ -28,6 +27,12 @@ namespace big
g_renderer->add_wndproc_callback([this](HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { g_renderer->add_wndproc_callback([this](HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
wndproc(hwnd, msg, wparam, lparam); wndproc(hwnd, msg, wparam, lparam);
}); });
g_renderer->add_wndproc_callback([](HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
if (g.cmd_executor.enabled && msg == WM_KEYUP && wparam == VK_ESCAPE)
{
g.cmd_executor.enabled = false;
}
});
g_renderer->add_dx_callback(view::vehicle_control, 3); g_renderer->add_dx_callback(view::vehicle_control, 3);
g_renderer->add_dx_callback(esp::draw, 2); // TODO: move to ESP service g_renderer->add_dx_callback(esp::draw, 2); // TODO: move to ESP service
@ -173,21 +178,6 @@ namespace big
PAD::DISABLE_CONTROL_ACTION(2, 262, true); PAD::DISABLE_CONTROL_ACTION(2, 262, true);
PAD::DISABLE_CONTROL_ACTION(2, 331, true); PAD::DISABLE_CONTROL_ACTION(2, 331, true);
} }
//wndproc will not work here. the timing here is very difficult. mayby can we hook the creation of the pause menu?
//this should be improved..
if (is_key_pressed(VK_ESCAPE) && g.cmd_executor.enabled)
{
g_fiber_pool->queue_job([] {
g.cmd_executor.enabled = false;
//50 should run stable, IMPROVE THIS!!!
for (uint8_t i = 0; i <= 50; i++)
{
HUD::SET_PAUSE_MENU_ACTIVE(false);
script::get_current()->yield();
}
});
}
} }
void gui::script_func() void gui::script_func()