Merge pull request #236 from Sergwest585/main

arch compability fixes and unwarning changes
This commit is contained in:
MihailRis
2024-06-07 22:37:03 +03:00
committed by GitHub
7 changed files with 9 additions and 1 deletions
+2
View File
@@ -13,6 +13,8 @@ Debug/voxel_engine
/worlds/**/*
/settings.toml
/controls.json
/controls.toml
/latest.log
/.idea
.vscode
-1
View File
@@ -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()
+1
View File
@@ -1,6 +1,7 @@
#include "TextBox.hpp"
#include <utility>
#include <algorithm>
#include "Label.hpp"
#include "../../core/DrawContext.hpp"
+1
View File
@@ -19,6 +19,7 @@
#include <memory>
#include <filesystem>
#include <algorithm>
namespace fs = std::filesystem;
+2
View File
@@ -10,6 +10,8 @@
#include "scripting/scripting.hpp"
#include "../interfaces/Object.hpp"
#include <algorithm>
static debug::Logger logger("level-control");
LevelController::LevelController(EngineSettings& settings, std::unique_ptr<Level> level)
+2
View File
@@ -24,6 +24,8 @@
#include "../core_defs.hpp"
#include "../settings.hpp"
#include <algorithm>
const float CAM_SHAKE_OFFSET = 0.025f;
const float CAM_SHAKE_OFFSET_Y = 0.031f;
const float CAM_SHAKE_SPEED = 1.75f;
+1
View File
@@ -12,6 +12,7 @@
#include <string>
#include <stdexcept>
#include <filesystem>
#include <algorithm>
static int l_pack_get_folder(lua_State* L) {
std::string packName = lua_tostring(L, 1);