From 8774cfa31b9683908a6b9aeb116826f1d6fa0132 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Tue, 21 Apr 2026 18:51:14 -0700 Subject: [PATCH] fix conflicts --- files.cmake | 2 -- src/dusk/imgui/ImGuiConsole.cpp | 1 - src/dusk/imgui/ImGuiConsole.hpp | 1 - 3 files changed, 4 deletions(-) diff --git a/files.cmake b/files.cmake index e5e2258929..958e0c69f7 100644 --- a/files.cmake +++ b/files.cmake @@ -1365,8 +1365,6 @@ set(DUSK_FILES src/dusk/imgui/ImGuiBloomWindow.hpp src/dusk/imgui/ImGuiMenuTools.cpp src/dusk/imgui/ImGuiMenuTools.hpp - src/dusk/imgui/ImGuiMenuEnhancements.cpp - src/dusk/imgui/ImGuiMenuEnhancements.hpp src/dusk/imgui/ImGuiMenuRandomizer.cpp src/dusk/imgui/ImGuiMenuRandomizer.hpp src/dusk/imgui/ImGuiPreLaunchWindow.cpp diff --git a/src/dusk/imgui/ImGuiConsole.cpp b/src/dusk/imgui/ImGuiConsole.cpp index f849f4cf71..561a1ce200 100644 --- a/src/dusk/imgui/ImGuiConsole.cpp +++ b/src/dusk/imgui/ImGuiConsole.cpp @@ -324,7 +324,6 @@ namespace dusk { ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.0f, 0.0f, 0.0f, 0.0f)); if (showMenu && ImGui::BeginMainMenuBar()) { m_menuGame.draw(); - m_menuEnhancements.draw(); m_menuRandomizer.draw(); m_menuTools.draw(); diff --git a/src/dusk/imgui/ImGuiConsole.hpp b/src/dusk/imgui/ImGuiConsole.hpp index aaa2e5e10c..719254eb38 100644 --- a/src/dusk/imgui/ImGuiConsole.hpp +++ b/src/dusk/imgui/ImGuiConsole.hpp @@ -52,7 +52,6 @@ private: ImGuiFirstRunPreset m_firstRunPreset; ImGuiMenuGame m_menuGame; - ImGuiMenuEnhancements m_menuEnhancements; ImGuiMenuRandomizer m_menuRandomizer; ImGuiPreLaunchWindow m_preLaunchWindow;