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

allow checking if combine_things() will create free space

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-19 13:43:20 -05:00
parent ea47359739
commit e1b2c27c57
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/universe/pc.cpp
View File

@@ -709,16 +709,19 @@ const cInvenSlot cPlayer::has_space() const {
return const_cast<cPlayer*>(this)->has_space();
}
void cPlayer::combine_things() {
bool cPlayer::combine_things(bool check_only) {
bool can_combine = false;
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) {
can_combine = true;
if(check_only) continue;
if(print_result) print_result("(items combined)");
short test = items[i].charges + items[j].charges;
if(test > 125) {
items[i].charges = 125;
if(print_result) print_result("(Can have at most 125 of any item.");
if(print_result) print_result("(Can have at most 125 of any item.)");
}
else items[i].charges += items[j].charges;
if(equip[j]) {
@@ -731,6 +734,7 @@ void cPlayer::combine_things() {
if(items[i].variety != eItemType::NO_ITEM && items[i].charges < 0)
items[i].charges = 1;
}
return can_combine;
}
short cPlayer::get_prot_level(eItemAbil abil, short dat) const {

2
src/universe/pc.hpp
View File

@@ -143,7 +143,7 @@ public:
void drain_sp(int how_much, bool allow_resist) override;
void restore_sp(int how_much) override;
void combine_things();
bool combine_things(bool check_only = false);
void sort_items();
bool give_item(cItem item, int flags);
bool equip_item(int which_item, bool do_print);