diff --git a/src/engine.cpp b/src/engine.cpp index aa2dc929..052c3e90 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -11,7 +11,7 @@ #include "core_defs.h" #include "files/files.h" #include "frontend/locale/langs.h" -#include "frontend/menu/menu.hpp" +#include "frontend/menu.hpp" #include "frontend/screens.h" #include "graphics/core/Batch2D.h" #include "graphics/core/GfxContext.h" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 1c7508d2..79ad514e 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -42,7 +42,7 @@ #include "ContentGfxCache.h" #include "InventoryView.h" #include "LevelFrontend.h" -#include "menu/menu.hpp" +#include "menu.hpp" #include "screens.h" #include "UiDocument.h" diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu.cpp similarity index 68% rename from src/frontend/menu/menu.cpp rename to src/frontend/menu.cpp index f3fd08fa..6cf69eef 100644 --- a/src/frontend/menu/menu.cpp +++ b/src/frontend/menu.cpp @@ -5,18 +5,18 @@ #include #include -#include "../../delegates.h" -#include "../../engine.h" -#include "../../files/engine_paths.h" -#include "../../graphics/ui/elements/display/Label.hpp" -#include "../../graphics/ui/elements/layout/Menu.hpp" -#include "../../graphics/ui/gui_util.h" -#include "../../graphics/ui/GUI.h" -#include "../../logic/scripting/scripting.h" -#include "../../settings.h" -#include "../../util/stringutil.h" -#include "../../window/Window.h" -#include "../UiDocument.h" +#include "../delegates.h" +#include "../engine.h" +#include "../files/engine_paths.h" +#include "../graphics/ui/elements/display/Label.hpp" +#include "../graphics/ui/elements/layout/Menu.hpp" +#include "../graphics/ui/gui_util.h" +#include "../graphics/ui/GUI.h" +#include "../logic/scripting/scripting.h" +#include "../settings.h" +#include "../util/stringutil.h" +#include "../window/Window.h" +#include "UiDocument.h" namespace fs = std::filesystem; using namespace gui; diff --git a/src/frontend/menu/menu.hpp b/src/frontend/menu.hpp similarity index 100% rename from src/frontend/menu/menu.hpp rename to src/frontend/menu.hpp diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp index 7cf828be..9fd0ad4d 100644 --- a/src/frontend/screens.cpp +++ b/src/frontend/screens.cpp @@ -32,7 +32,7 @@ #include "ContentGfxCache.h" #include "hud.h" #include "LevelFrontend.h" -#include "menu/menu.hpp" +#include "menu.hpp" #include #include diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index 0366f9b2..2efe9fac 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -3,7 +3,7 @@ #include "../../../engine.h" #include "../../../files/engine_paths.h" -#include "../../../frontend/menu/menu.hpp" +#include "../../../frontend/menu.hpp" #include "../../../frontend/screens.h" #include "../../../logic/LevelController.h" #include "../../../logic/EngineController.hpp"