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

Add clear method to cInvenSlot

Browse Source 
This also fixes an issue with applying poison to a weapon.
This commit is contained in:
Celtic Minstrel
2016-09-15 17:06:50 -04:00
parent 13fa4a9ebf
commit 8aaa0a24c0
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/boe.party.cpp
View File

@@ -433,7 +433,7 @@ bool poison_weapon(short pc_num, short how_much,bool safe) {
}
if(!safe)
play_sound(55);
univ.party[pc_num].weap_poisoned.slot = weap - univ.party[pc_num].items.end();
univ.party[pc_num].weap_poisoned.slot = weap - univ.party[pc_num].items.begin();
univ.party[pc_num].status[eStatus::POISONED_WEAPON] = max(univ.party[pc_num].status[eStatus::POISONED_WEAPON], p_level);
return true;

6
src/classes/pc.cpp
View File

@@ -541,8 +541,10 @@ bool cPlayer::give_item(cItem item, int flags) {
else if(can_rem1 && items[rem1].variety != item.variety)
equip[rem1] = false;
}
if((rem1 == weap_poisoned.slot && !equip[rem1]) || (rem2 == weap_poisoned.slot && !equip[rem2]))
if((rem1 == weap_poisoned.slot && !equip[rem1]) || (rem2 == weap_poisoned.slot && !equip[rem2])) {
status[eStatus::POISONED_WEAPON] = 0;
weap_poisoned.clear();
}
} else if(can_rem1)
equip[rem1] = false;
equip_item(free_space.slot, false);
@@ -618,6 +620,7 @@ bool cPlayer::unequip_item(int which_item, bool do_print) {
if(do_print && print_result)
print_result(" Poison lost.");
status[eStatus::POISONED_WEAPON] = 0;
weap_poisoned.clear();
}
return true;
}
@@ -849,6 +852,7 @@ void cPlayer::take_item(int which_item) {
if(weap_poisoned.slot == which_item && status[eStatus::POISONED_WEAPON] > 0) {
if(print_result) print_result(" Poison lost.");
status[eStatus::POISONED_WEAPON] = 0;
weap_poisoned.clear();
}
if(weap_poisoned.slot > which_item && status[eStatus::POISONED_WEAPON] > 0)
weap_poisoned.slot--;

3
src/classes/pc.hpp
View File

@@ -40,6 +40,9 @@ struct cInvenSlot {
unsigned int slot;
explicit cInvenSlot(cPlayer& owner) : slot(std::numeric_limits<unsigned int>::max()), owner(owner) {}
cInvenSlot(cPlayer& owner, int slot) : slot(slot), owner(owner) {}
void clear() {
slot = std::numeric_limits<unsigned int>::max();
}
explicit operator bool() const;
bool operator !() const;
cItem* operator->();