mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-21 18:09:46 +00:00
fix content inheritance issues
This commit is contained in:
parent
8124b550df
commit
c9cc301e46
10 changed files with 55 additions and 22 deletions
|
|
@ -120,8 +120,7 @@ const BlockRotProfile BlockRotProfile::LADDER {
|
|||
4
|
||||
};
|
||||
|
||||
Block::Block(const std::string& name)
|
||||
: name(name), caption(util::id_to_caption(name)) {
|
||||
Block::Block(const std::string& name) : name(name) {
|
||||
for (int i = 0; i < defaults.textureFaces.size(); i++) {
|
||||
defaults.textureFaces[i] = TEXTURE_NOTFOUND;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ public:
|
|||
BlockRotProfile rotations = BlockRotProfile::NONE;
|
||||
|
||||
/// @brief Item will be picked on MMB click on the block
|
||||
std::string pickingItem = name + BLOCK_ITEM_SUFFIX;
|
||||
std::string pickingItem;
|
||||
|
||||
/// @brief Block script name in blocks/ without extension
|
||||
std::string scriptName = name.substr(name.find(':') + 1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue