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

Add an info structure for eItemType enum

Browse Source
This commit is contained in:
Celtic Minstrel
2017-04-15 02:03:42 -04:00
parent c2ce2a2cd1
commit 1f9615d185
7 changed files with 78 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/boe.party.cpp
View File

@@ -2278,7 +2278,7 @@ bool damage_pc(cPlayer& which_pc,short how_much,eDamageType damage_type,eRace ty
how_much -= minmax(-5,5,which_pc.status[eStatus::BLESS_CURSE]);
for(short i = 0; i < which_pc.items.size(); i++) {
if((which_pc.items[i].variety != eItemType::NO_ITEM) && (which_pc.equip[i])) {
if(isArmourType(which_pc.items[i].variety)) {
if((*which_pc.items[i].variety).is_armour) {
r1 = get_ran(1,1,which_pc.items[i].item_level);
how_much -= r1;

6
src/game/boe.text.cpp
View File

@@ -314,7 +314,7 @@ void put_item_screen(short screen_num) {
style.italic = true;
if(univ.party[pc].items[i_num].variety == eItemType::ONE_HANDED || univ.party[pc].items[i_num].variety == eItemType::TWO_HANDED)
style.colour = sf::Color::Magenta;
else if(isArmourType(univ.party[pc].items[i_num].variety))
else if((*univ.party[pc].items[i_num].variety).is_armour)
style.colour = sf::Color::Green;
else style.colour = sf::Color::Blue;
} else style.colour = sf::Color::Black;
@@ -394,7 +394,7 @@ void place_buy_button(short position,short pc_num,short item_num) {
}
break;
case MODE_SELL_WEAP:
if(isWeaponType(univ.party[pc_num].items[item_num].variety) &&
if((*univ.party[pc_num].items[item_num].variety).is_weapon &&
(!univ.party[pc_num].equip[item_num]) &&
(univ.party[pc_num].items[item_num].ident) && (val_to_place > 0) &&
(!univ.party[pc_num].items[item_num].unsellable)) {
@@ -403,7 +403,7 @@ void place_buy_button(short position,short pc_num,short item_num) {
}
break;
case MODE_SELL_ARMOR:
if(isArmourType(univ.party[pc_num].items[item_num].variety) &&
if((*univ.party[pc_num].items[item_num].variety).is_armour &&
(!univ.party[pc_num].equip[item_num]) &&
(univ.party[pc_num].items[item_num].ident) && (val_to_place > 0) &&
(!univ.party[pc_num].items[item_num].unsellable)) {