From 0da6c1034d5b028ede7d01b336db77bfbbd12817 Mon Sep 17 00:00:00 2001 From: ALONSO Laurent Date: Sun, 19 Dec 2021 13:28:02 +0100 Subject: [PATCH] item: try to avoid to combine some different items... --- src/universe/pc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/universe/pc.cpp b/src/universe/pc.cpp index f1bf7e8b..e9499dfe 100644 --- a/src/universe/pc.cpp +++ b/src/universe/pc.cpp @@ -712,7 +712,9 @@ void cPlayer::combine_things() { for(int i = 0; i < items.size(); i++) { if(items[i].variety != eItemType::NO_ITEM && items[i].type_flag > 0 && items[i].ident) { for(int j = i + 1; j < items.size(); j++) - if(items[j].variety != eItemType::NO_ITEM && items[j].type_flag == items[i].type_flag && items[j].ident) { + if(items[j].variety != eItemType::NO_ITEM && items[j].type_flag == items[i].type_flag && + items[j].name == items[i].name && items[j].special_class == items[i].special_class && + items[j].ident) { if(print_result) print_result("(items combined)"); short test = items[i].charges + items[j].charges; if(test > 125) {