diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index ab6daeaab5..ad4949df7a 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -870,7 +870,7 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef& node) { item->stack.guild_storage = false; } } - + if (this->nodeExists(node, "NoUse")) { const auto& nouseNode = node["NoUse"]; @@ -1064,7 +1064,7 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef& node) { item->script = parse_script(script.c_str(), this->getCurrentFile().c_str(), this->getLineNumber(node["Script"]), SCRIPT_IGNORE_EXTERNAL_BRACKETS); } else { - if (!exists) + if (!exists) item->script = nullptr; } @@ -3186,7 +3186,7 @@ uint64 ItemGroupDatabase::parseBodyNode(const ryml::NodeRef& node) { this->invalidWarning(node, "Invalid AnnounceBoxItemId node.\n"); } if (!item_db.exists(tmp_nameid)) { - ShowWarning("ItemGroupDatabase::parseBodyNode: Box item `%lu` does not exist. Ignoring.\n", tmp_nameid); + ShowWarning("ItemGroupDatabase::parseBodyNode: Box item `%u` does not exist. Ignoring.\n", tmp_nameid); } else { group->announce_box_id = tmp_nameid; @@ -4143,7 +4143,7 @@ static int itemdb_read_sqldb(void) { bool itemdb_isNoEquip(struct item_data *id, uint16 m) { if (!id->flag.no_equip) return false; - + struct map_data *mapdata = map_getmapdata(m); if ((id->flag.no_equip&1 && !mapdata_flag_vs2(mapdata)) || // Normal @@ -4555,18 +4555,18 @@ static void itemdb_read(void) { "", "/" DBIMPORT, }; - + if (db_use_sqldbs) itemdb_read_sqldb(); else item_db.load(); - + for(i=0; i