openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

item: try to avoid to combine some different items...

Browse Source
This commit is contained in:
ALONSO Laurent
2021-12-19 13:28:02 +01:00
committed by Celtic Minstrel
parent 6cc07bffb9
commit 0da6c1034d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/universe/pc.cpp
View File

@@ -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) {