PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

content-loader icon-type reset fix

Browse Source
This commit is contained in:
MihailRis
2024-01-23 23:28:18 +03:00
parent 36a5da5bc1
commit 2aaa37bb7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/content/ContentLoader.cpp
+2 -2
View File
@@ -221,7 +221,7 @@ void ContentLoader::loadCustomBlockModel(Block* def, dynamic::Map* primitives) {
void ContentLoader::loadItem(ItemDef* def, std::string name, fs::path file) { void ContentLoader::loadItem(ItemDef* def, std::string name, fs::path file) {
auto root = files::read_json(file); auto root = files::read_json(file);
std::string iconTypeStr = "none"; std::string iconTypeStr = "";
root->str("icon-type", iconTypeStr); root->str("icon-type", iconTypeStr);
if (iconTypeStr == "none") { if (iconTypeStr == "none") {
def->iconType = item_icon_type::none; def->iconType = item_icon_type::none;
@@ -229,7 +229,7 @@ void ContentLoader::loadItem(ItemDef* def, std::string name, fs::path file) {
def->iconType = item_icon_type::block; def->iconType = item_icon_type::block;
} else if (iconTypeStr == "sprite") { } else if (iconTypeStr == "sprite") {
def->iconType = item_icon_type::sprite; def->iconType = item_icon_type::sprite;
} else { } else if (iconTypeStr.length()){
std::cerr << "unknown icon type" << iconTypeStr << std::endl; std::cerr << "unknown icon type" << iconTypeStr << std::endl;
} }
root->str("icon", def->icon); root->str("icon", def->icon);