From f3fb847674b643b3a17eb6372823db8e171e2ff8 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Fri, 5 Jan 2024 12:30:26 +0300 Subject: [PATCH] Item Table fix --- src/CRE/item_table.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CRE/item_table.cpp b/src/CRE/item_table.cpp index 2c3fa49d..b23fabdd 100644 --- a/src/CRE/item_table.cpp +++ b/src/CRE/item_table.cpp @@ -337,6 +337,8 @@ static void item_table_load(data_struct* data, item_table& itm_tbl, itm_table& i itm_tbl.item.push_back(i.no, itm); } + itm_tbl.item.combine(); + for (itm_table_dbgset& i : itm_tbl_file.dbgset) { if (aft_obj_db->get_object_set_id(i.name.c_str()) == -1) continue; @@ -351,6 +353,8 @@ static void item_table_load(data_struct* data, item_table& itm_tbl, itm_table& i itm_tbl.dbgset.push_back(i.name, cos); } + itm_tbl.dbgset.combine(); + for (itm_table_cos& i : itm_tbl_file.cos) { if (!i.item.size()) continue; @@ -365,8 +369,5 @@ static void item_table_load(data_struct* data, item_table& itm_tbl, itm_table& i } itm_tbl.cos.push_back(499, {}); - - itm_tbl.item.combine(); - itm_tbl.dbgset.combine(); itm_tbl.cos.combine(); }