zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-08-09 02:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(gameplay): use inline const for static EMPTY members

Browse Source 
Use inline const for static EMPTY members to avoid ODR and linker issues.
Add missing block_manager.hpp includes in gameplay sources.
This commit is contained in:
zhenyan121
2026-08-04 16:20:16 +08:00
parent 0259ca71ce
commit 8af30e159d
8 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Cubed/gameplay/block_manager.hpp
View File

@@ -34,7 +34,7 @@ private:
using IDMap = tbb::concurrent_hash_map<std::string, BlockType>;
using CrossPlaneMap = tbb::concurrent_hash_map<BlockType, BlockType>;
static const BlockData EMPTY;
static inline const BlockData EMPTY;
static inline BlockMap m_datas;
static inline IDMap m_id_map;

2
include/Cubed/gameplay/item_manager.hpp
View File

@@ -34,6 +34,6 @@ private:
IDMap m_id_map;
BlockToIDMap m_block_to_id_map;
static constexpr ItemData EMPTY;
static inline const ItemData EMPTY;
};
} // namespace Cubed