Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[external/sol2] Updated.

Browse Source
This commit is contained in:
Quentin Bazin 2021-06-02 19:48:56 +02:00
parent 10b5235a42
commit a9657751ed
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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)

2
external/sol2 vendored

@ -1 +1 @@
Subproject commit 465b472b2c67743ca095f7fac1ee2c3843175851
Subproject commit c068aefbeddb3dd1f1fd38d42843ecb49a3b4cdb

10
source/common/core/Registry.hpp
View File

@ -135,8 +135,8 @@ class Registry : public gk::ISerializable {
static void initUsertype(sol::state &lua);
const std::vector<std::unique_ptr<Block>> &blocks() const { return m_blocks; }
const std::vector<std::unique_ptr<Item>> &items() const { return m_items; }
const std::vector<std::shared_ptr<Block>> &blocks() const { return m_blocks; }
const std::vector<std::shared_ptr<Item>> &items() const { return m_items; }
const std::vector<Tree> &trees() const { return m_trees; }
const std::vector<Biome> &biomes() const { return m_biomes; }
const std::vector<Dimension> &dimensions() const { return m_dimensions; }
@ -148,9 +148,9 @@ class Registry : public gk::ISerializable {
private:
static Registry *s_instance;
std::vector<std::unique_ptr<Block>> m_blocks;
std::vector<std::unique_ptr<Item>> m_items;
std::vector<std::unique_ptr<Recipe>> m_recipes;
std::vector<std::shared_ptr<Block>> m_blocks;
std::vector<std::shared_ptr<Item>> m_items;
std::vector<std::shared_ptr<Recipe>> m_recipes;
std::vector<Sky> m_skies;
std::vector<Tree> m_trees;
std::vector<Biome> m_biomes;