mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 02:51:49 +00:00
Items intruduced (part II)
This commit is contained in:
parent
eae00dbb11
commit
b5739c678f
15 changed files with 62 additions and 40 deletions
|
|
@ -7,7 +7,7 @@
|
|||
#include <glm/glm.hpp>
|
||||
|
||||
#include "Content.h"
|
||||
#include "ItemDef.h"
|
||||
#include "../items/ItemDef.h"
|
||||
#include "../util/listutil.h"
|
||||
#include "../voxels/Block.h"
|
||||
#include "../files/files.h"
|
||||
|
|
@ -175,6 +175,8 @@ void ContentLoader::loadBlock(Block* def, std::string name, fs::path file) {
|
|||
root->flag("hidden", def->hidden);
|
||||
root->flag("sky-light-passing", def->skyLightPassing);
|
||||
root->num("draw-group", def->drawGroup);
|
||||
|
||||
root->str("picking-item", def->pickingItem);
|
||||
}
|
||||
|
||||
void ContentLoader::loadItem(ItemDef* def, std::string name, std::filesystem::path file) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue