diff --git a/CMakeLists.txt b/CMakeLists.txt index 82ed94d4..f76dc3bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,9 +22,9 @@ include_directories(external) #------------------------------------------------------------------------------ # Compiler flags #------------------------------------------------------------------------------ -set(DEBUG_GCC_FLAGS -g -Og -Wall -Wextra -Wfatal-errors) -set(RELEASE_GCC_FLAGS -O3 -Wall -Wextra -Wfatal-errors) -set(RELWITHDEB_GCC_FLAGS -g -O3 -Wall -Wextra -Wfatal-errors) +set(DEBUG_GCC_FLAGS -g -Og -Wall -Wextra -Wfatal-errors -Wno-unused-parameter) +set(RELEASE_GCC_FLAGS -O3 -Wall -Wextra -Wfatal-errors -Wno-unused-parameter) +set(RELWITHDEB_GCC_FLAGS -g -O3 -Wall -Wextra -Wfatal-errors -Wno-unused-parameter) set(CMAKE_CXX_STANDARD 17) diff --git a/external/sol2 b/external/sol2 index 465b472b..c068aefb 160000 --- a/external/sol2 +++ b/external/sol2 @@ -1 +1 @@ -Subproject commit 465b472b2c67743ca095f7fac1ee2c3843175851 +Subproject commit c068aefbeddb3dd1f1fd38d42843ecb49a3b4cdb diff --git a/source/common/core/Registry.hpp b/source/common/core/Registry.hpp index 674512e3..df0f92b6 100644 --- a/source/common/core/Registry.hpp +++ b/source/common/core/Registry.hpp @@ -135,8 +135,8 @@ class Registry : public gk::ISerializable { static void initUsertype(sol::state &lua); - const std::vector> &blocks() const { return m_blocks; } - const std::vector> &items() const { return m_items; } + const std::vector> &blocks() const { return m_blocks; } + const std::vector> &items() const { return m_items; } const std::vector &trees() const { return m_trees; } const std::vector &biomes() const { return m_biomes; } const std::vector &dimensions() const { return m_dimensions; } @@ -148,9 +148,9 @@ class Registry : public gk::ISerializable { private: static Registry *s_instance; - std::vector> m_blocks; - std::vector> m_items; - std::vector> m_recipes; + std::vector> m_blocks; + std::vector> m_items; + std::vector> m_recipes; std::vector m_skies; std::vector m_trees; std::vector m_biomes;