From 3aa0298c85eb97ec2075bdf41d77e43918696137 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 17:08:11 +0300 Subject: [PATCH] files/ --- src/assets/AssetsLoader.cpp | 4 ++-- src/assets/assetload_funcs.cpp | 4 ++-- src/coders/GLSLExtension.cpp | 4 ++-- src/coders/png.cpp | 2 +- src/coders/toml.cpp | 2 +- src/content/ContentLUT.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/content/ContentPack.cpp | 4 ++-- src/core_defs.cpp | 4 ++-- src/engine.cpp | 4 ++-- src/engine.hpp | 2 +- src/files/WorldConverter.cpp | 2 +- src/frontend/UiDocument.cpp | 2 +- src/frontend/locale.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/EngineController.cpp | 4 ++-- src/logic/LevelController.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libfile.cpp | 4 ++-- src/logic/scripting/lua/libpack.cpp | 4 ++-- src/logic/scripting/lua/libworld.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/logic/scripting/scripting_hud.cpp | 2 +- src/util/command_line.cpp | 2 +- src/voxel_engine.cpp | 4 ++-- src/voxels/Chunks.cpp | 2 +- src/voxels/ChunksStorage.cpp | 2 +- src/world/World.cpp | 2 +- 30 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index a9953d5c..c5849656 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -10,8 +10,8 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include "../graphics/core/Texture.hpp" #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 31eec6ca..2b0eb924 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -12,8 +12,8 @@ #include #include #include "../data/dynamic.hpp" -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include "../frontend/UiDocument.hpp" #include "../graphics/core/Atlas.hpp" #include "../graphics/core/Font.hpp" diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp index 30125366..96f3ba15 100644 --- a/src/coders/GLSLExtension.cpp +++ b/src/coders/GLSLExtension.cpp @@ -5,8 +5,8 @@ #include #include -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include #include #include "../util/stringutil.hpp" diff --git a/src/coders/png.cpp b/src/coders/png.cpp index e93c3c44..c17fa19f 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -5,7 +5,7 @@ #include #include -#include "../files/files.hpp" +#include #include "../graphics/core/GLTexture.hpp" #include "../graphics/core/ImageData.hpp" diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp index 9250b431..a1b8fe10 100644 --- a/src/coders/toml.cpp +++ b/src/coders/toml.cpp @@ -8,7 +8,7 @@ #include "../data/dynamic.hpp" #include "../data/setting.hpp" -#include "../files/settings_io.hpp" +#include #include "../util/stringutil.hpp" #include "commons.hpp" diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp index 620b4d0f..5e3d80d4 100644 --- a/src/content/ContentLUT.cpp +++ b/src/content/ContentLUT.cpp @@ -4,7 +4,7 @@ #include #include -#include "../files/files.hpp" +#include #include "../items/ItemDef.hpp" #include "../voxels/Block.hpp" #include "Content.hpp" diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 59346f70..49d4eace 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -10,7 +10,7 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/files.hpp" +#include #include "../items/ItemDef.hpp" #include "../logic/scripting/scripting.hpp" #include "../objects/rigging.hpp" diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index d972a026..a50b69eb 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -6,8 +6,8 @@ #include #include "../data/dynamic.hpp" -#include "../files/engine_paths.hpp" -#include "../files/files.hpp" +#include +#include namespace fs = std::filesystem; diff --git a/src/core_defs.cpp b/src/core_defs.cpp index ce997914..3cd0bcab 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -3,8 +3,8 @@ #include "items/ItemDef.hpp" #include #include -#include "files/files.hpp" -#include "files/engine_paths.hpp" +#include +#include #include "window/Window.hpp" #include "window/Events.hpp" #include "window/input.hpp" diff --git a/src/engine.cpp b/src/engine.cpp index 39b23990..4d588488 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -13,8 +13,8 @@ #include #include #include -#include "files/files.hpp" -#include "files/settings_io.hpp" +#include +#include #include "frontend/locale.hpp" #include "frontend/menu.hpp" #include "frontend/screens/Screen.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 6869e1da..bb7769ce 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "files/engine_paths.hpp" +#include #include "util/ObjectsKeeper.hpp" #include diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp index 41291a13..14117ebc 100644 --- a/src/files/WorldConverter.cpp +++ b/src/files/WorldConverter.cpp @@ -8,7 +8,7 @@ #include #include "../data/dynamic.hpp" #include -#include "../files/files.hpp" +#include #include "../objects/Player.hpp" #include "../util/ThreadPool.hpp" #include "../voxels/Chunk.hpp" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index 3951e4e9..86dae7eb 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -2,7 +2,7 @@ #include -#include "../files/files.hpp" +#include #include "../graphics/ui/elements/UINode.hpp" #include "../graphics/ui/elements/InventoryView.hpp" #include "../graphics/ui/gui_xml.hpp" diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp index b8b7e32a..18d13ce1 100644 --- a/src/frontend/locale.cpp +++ b/src/frontend/locale.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "../files/files.hpp" +#include #include "../util/stringutil.hpp" #include "../data/dynamic.hpp" #include diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 04882933..cca8b020 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -8,7 +8,7 @@ #include #include "../data/dynamic.hpp" #include "../interfaces/Task.hpp" -#include "../files/engine_paths.hpp" +#include #include "../graphics/ui/elements/Menu.hpp" #include "../graphics/ui/gui_util.hpp" #include "../graphics/ui/GUI.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 132c5f48..d83fbf69 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../../files/files.hpp" +#include #include #include "../../graphics/core/DrawContext.hpp" #include "../../graphics/core/ImageData.hpp" diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index bf717b97..5d7826b9 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -6,7 +6,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../lighting/Lighting.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index d5a32829..d38e68fc 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "../files/WorldConverter.hpp" -#include "../files/WorldFiles.hpp" +#include +#include #include "../frontend/locale.hpp" #include "../frontend/menu.hpp" #include "../frontend/screens/LevelScreen.hpp" diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index d4030a32..695e22f2 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -3,7 +3,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../interfaces/Object.hpp" #include "../objects/Entities.hpp" #include "../physics/Hitbox.hpp" diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index 1e29856d..b19bf539 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../../files/engine_paths.hpp" -#include "../../../files/settings_io.hpp" +#include +#include #include "../../../frontend/menu.hpp" #include "../../../frontend/screens/MenuScreen.hpp" #include "../../../logic/EngineController.hpp" diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp index df4cf545..9c8c647d 100644 --- a/src/logic/scripting/lua/libfile.cpp +++ b/src/logic/scripting/lua/libfile.cpp @@ -3,8 +3,8 @@ #include #include -#include "../../../files/engine_paths.hpp" -#include "../../../files/files.hpp" +#include +#include #include "../../../util/stringutil.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index acdd459b..827ad9d7 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -6,8 +6,8 @@ #include #include #include -#include "../../../files/WorldFiles.hpp" -#include "../../../files/engine_paths.hpp" +#include +#include #include "../../../world/Level.hpp" #include "../../../world/World.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index 0e8cda6f..e3bdcb00 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "../../../files/engine_paths.hpp" +#include #include "../../../world/Level.hpp" #include "../../../world/World.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index b357a95b..b63d4365 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../../files/engine_paths.hpp" -#include "../../files/files.hpp" +#include +#include #include "../../frontend/UiDocument.hpp" #include "../../items/Inventory.hpp" #include "../../items/ItemDef.hpp" diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index 158e4d67..b86902a6 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -2,7 +2,7 @@ #include #include -#include "../../files/files.hpp" +#include #include "../../frontend/hud.hpp" #include "../../objects/Player.hpp" #include "lua/api_lua.hpp" diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 1f988e5c..9485e6f8 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -6,7 +6,7 @@ #include #include -#include "../files/engine_paths.hpp" +#include namespace fs = std::filesystem; diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index bbbed530..af0cc60c 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,7 +1,7 @@ #include #include -#include "files/settings_io.hpp" -#include "files/engine_paths.hpp" +#include +#include #include "util/platform.hpp" #include "util/command_line.hpp" #include diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index fb6e174c..4ff3ea7f 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../files/WorldFiles.hpp" +#include #include "../graphics/core/Mesh.hpp" #include "../lighting/Lightmap.hpp" #include "../maths/aabb.hpp" diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp index 8166d83a..f3c91df1 100644 --- a/src/voxels/ChunksStorage.cpp +++ b/src/voxels/ChunksStorage.cpp @@ -2,7 +2,7 @@ #include #include -#include "../files/WorldFiles.hpp" +#include #include "../items/Inventories.hpp" #include "../lighting/Lightmap.hpp" #include "../maths/voxmaths.hpp" diff --git a/src/world/World.cpp b/src/world/World.cpp index 591e99a1..b1892af6 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../files/WorldFiles.hpp" +#include #include "../items/Inventories.hpp" #include "../objects/Entities.hpp" #include "../objects/Player.hpp"