From 2aaa37bb7d09dfc9b4d4a2af5c3426da1a0ab7ac Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 23 Jan 2024 23:28:18 +0300 Subject: [PATCH] content-loader icon-type reset fix --- src/content/ContentLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index 5fccd3a6..21ea9dc4 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -221,7 +221,7 @@ void ContentLoader::loadCustomBlockModel(Block* def, dynamic::Map* primitives) { void ContentLoader::loadItem(ItemDef* def, std::string name, fs::path file) { auto root = files::read_json(file); - std::string iconTypeStr = "none"; + std::string iconTypeStr = ""; root->str("icon-type", iconTypeStr); if (iconTypeStr == "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; } else if (iconTypeStr == "sprite") { def->iconType = item_icon_type::sprite; - } else { + } else if (iconTypeStr.length()){ std::cerr << "unknown icon type" << iconTypeStr << std::endl; } root->str("icon", def->icon);