From f0ededde17b691faf28bb9ab0c1432cbcb983764 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Mon, 1 Dec 2014 13:35:15 -0500 Subject: [PATCH] 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.) --- osx/boe.text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/boe.text.cpp b/osx/boe.text.cpp index 4916d5756..ac51e9ce6 100644 --- a/osx/boe.text.cpp +++ b/osx/boe.text.cpp @@ -413,8 +413,8 @@ void place_buy_button(short position,short pc_num,short item_num) break; case 3: // sell weapons 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].equip[item_num]) && (univ.party[pc_num].items[item_num].ident) && (val_to_place > 0) && (!univ.party[pc_num].items[item_num].unsellable)) { item_area_button_active[position][5] = true;