diff --git a/.gitignore b/.gitignore index 72fa6d1a..d7b5168d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ Debug/voxel_engine /worlds/**/* /settings.toml /controls.json +/controls.toml +/latest.log /.idea .vscode diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ec2faab..1da3b155 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,6 @@ else() set(LUA_LIBRARIES ${LUAJIT_LIBRARIES}) set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIRS}) find_package(PNG REQUIRED) - find_package(Lua REQUIRED) set(PNGLIB PNG::PNG) set(VORBISLIB ${VORBIS_LDFLAGS}) endif() diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 209145d4..247ac5a6 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -1,6 +1,7 @@ #include "TextBox.hpp" #include +#include #include "Label.hpp" #include "../../core/DrawContext.hpp" diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 9b65826c..4c56d8e3 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -19,6 +19,7 @@ #include #include +#include namespace fs = std::filesystem; diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index 58eaca41..d8afbc57 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -10,6 +10,8 @@ #include "scripting/scripting.hpp" #include "../interfaces/Object.hpp" +#include + static debug::Logger logger("level-control"); LevelController::LevelController(EngineSettings& settings, std::unique_ptr level) diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 9a46b13d..74fa97a5 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -24,6 +24,8 @@ #include "../core_defs.hpp" #include "../settings.hpp" +#include + const float CAM_SHAKE_OFFSET = 0.025f; const float CAM_SHAKE_OFFSET_Y = 0.031f; const float CAM_SHAKE_SPEED = 1.75f; diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 6abd98b0..683f17e3 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -12,6 +12,7 @@ #include #include #include +#include static int l_pack_get_folder(lua_State* L) { std::string packName = lua_tostring(L, 1);