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

Make cPlayer::give_item() return the reason for failure

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-19 18:38:25 -05:00
parent 599f1030f2
commit c63bbd96dc
8 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/boe.items.cpp
View File

@@ -207,17 +207,24 @@ void give_thing(short pc_num, short item_num) {
univ.party[pc_num].items[item_num].charges -= how_many;
item_store.charges = how_many;
}
if(univ.party[who_to].give_item(item_store,0)) {
if(take_given_item)
univ.party[pc_num].take_item(item_num);
}
else {
if(!univ.party[who_to].has_space())
eBuyStatus give_status = univ.party[who_to].give_item(item_store,0);
switch(give_status){
case eBuyStatus::OK:
if(take_given_item){
univ.party[pc_num].take_item(item_num);
}
break;
case eBuyStatus::NO_SPACE:
ASB("Can't give: PC has max. # of items.");
else ASB("Can't give: PC carrying too much.");
// Can't give to the recipient. Put charges back in giver's inventory:
if(how_many > 0)
univ.party[pc_num].items[item_num].charges += how_many;
if(false) // Skip first line of fallthrough
case eBuyStatus::TOO_HEAVY:
ASB("Can't give: PC carrying too much.");
// Can't give to the recipient. Put charges back in giver's inventory:
if(how_many > 0)
univ.party[pc_num].items[item_num].charges += how_many;
break;
default:
break;
}
}
}