Fix F3 opening host menu (#522)
* Fix debug menu opening game info menu * remove redundant F4 handling
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user