Somehow, these lines got out of order, throwing off the whole conditional

- If I read the code correctly, the result was that you could sell weapons other than crossbows bolts without dequipping them first
(Fortunately && has higher precedence than ||, otherwise it would've been a lot worse.)
This commit is contained in:
2014-12-01 13:35:15 -05:00
parent 8a3db4177f
commit f0ededde17

View File

@@ -413,8 +413,8 @@ void place_buy_button(short position,short pc_num,short item_num)
break; break;
case 3: // sell weapons case 3: // sell weapons
if (((univ.party[pc_num].items[item_num].variety < 7) || (univ.party[pc_num].items[item_num].variety == 23) || if (((univ.party[pc_num].items[item_num].variety < 7) || (univ.party[pc_num].items[item_num].variety == 23) ||
(!univ.party[pc_num].equip[item_num]) &&
(univ.party[pc_num].items[item_num].variety == 24)) && (univ.party[pc_num].items[item_num].variety == 24)) &&
(!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].ident) && (val_to_place > 0) &&
(!univ.party[pc_num].items[item_num].unsellable)) { (!univ.party[pc_num].items[item_num].unsellable)) {
item_area_button_active[position][5] = true; item_area_button_active[position][5] = true;