diff options
| author | Alezito2008 <92759854+Alezito2008@users.noreply.github.com> | 2026-03-05 04:26:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-05 14:26:19 +0700 |
| commit | 053eb0119cc5d154a63b19cbddd8e8d91404068b (patch) | |
| tree | cd2c19b9dac7c71fd1e1b5cd73561bd8635d557a /Minecraft.Client | |
| parent | 91e50aa346c975d1f177b7ec2201c4e01839d75d (diff) | |
Fix F3 opening host menu (#522)
* Fix debug menu opening game info menu
* remove redundant F4 handling
Diffstat (limited to 'Minecraft.Client')
| -rw-r--r-- | Minecraft.Client/Minecraft.cpp | 4 | ||||
| -rw-r--r-- | Minecraft.Client/Windows64/KeyboardMouseInput.h | 1 | ||||
| -rw-r--r-- | Minecraft.Client/Windows64/Windows64_Minecraft.cpp | 13 |
3 files changed, 3 insertions, 15 deletions
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 19ee79bd..70bb8014 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -1494,9 +1494,9 @@ void Minecraft::run_middle() if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_THIRD_PERSON)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_THIRD_PERSON; - if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_INFO)) + if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_MENU)) { - localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_GAME_INFO; + localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG; } // In flying mode, Shift held = sneak/descend diff --git a/Minecraft.Client/Windows64/KeyboardMouseInput.h b/Minecraft.Client/Windows64/KeyboardMouseInput.h index 89a028b1..5945b26a 100644 --- a/Minecraft.Client/Windows64/KeyboardMouseInput.h +++ b/Minecraft.Client/Windows64/KeyboardMouseInput.h @@ -30,6 +30,7 @@ public: static const int KEY_PAUSE = VK_ESCAPE; static const int KEY_THIRD_PERSON = VK_F5; static const int KEY_DEBUG_INFO = VK_F3; + static const int KEY_DEBUG_MENU = VK_F4; void Init(); void Tick(); diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 49c43cea..d38ad442 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -1569,19 +1569,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, } #ifdef _DEBUG_MENUS_ENABLED - // F4 Open debug overlay - if (g_KBMInput.IsKeyPressed(VK_F4)) - { - if (Minecraft *pMinecraft = Minecraft::GetInstance()) - { - if (pMinecraft->options && - app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL) - { - ui.NavigateToScene(0, eUIScene_DebugOverlay, NULL, eUILayer_Debug); - } - } - } - // F6 Open debug console if (g_KBMInput.IsKeyPressed(VK_F6)) { |