summaryrefslogtreecommitdiff
path: root/src/map/vending.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@users.noreply.github.com>2013-11-07 11:10:40 -0800
committershennetsind <shennetsind@users.noreply.github.com>2013-11-07 11:10:40 -0800
commit01e4647db2d5c635c7b4447f37663797a3f47b99 (patch)
tree94303465410557176454305aeeab76a13ca8514d /src/map/vending.c
parent9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff)
parent951b18c97a09426e2f14801263c2fd07efbd46bb (diff)
downloadhercules-01e4647db2d5c635c7b4447f37663797a3f47b99.tar.gz
hercules-01e4647db2d5c635c7b4447f37663797a3f47b99.tar.bz2
hercules-01e4647db2d5c635c7b4447f37663797a3f47b99.tar.xz
hercules-01e4647db2d5c635c7b4447f37663797a3f47b99.zip
Merge pull request #220 from shennetsind/master
mhalicot's Item Bind Pull Request
Diffstat (limited to 'src/map/vending.c')
-rw-r--r--src/map/vending.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/vending.c b/src/map/vending.c
index c7a2dfa68..f16a208e4 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -257,7 +257,8 @@ void vending_openvending(struct map_session_data* sd, const char* message, const
|| !sd->status.cart[index].identify // unidentified item
|| sd->status.cart[index].attribute == 1 // broken item
|| sd->status.cart[index].expire_time // It should not be in the cart but just in case
- || !itemdb_cantrade(&sd->status.cart[index], pc->get_group_level(sd), pc->get_group_level(sd)) ) // untradeable item
+ || (sd->status.cart[index].bound && !pc->can_give_bound_items(sd)) // can't trade bound items w/o permission
+ || !itemdb_cantrade(&sd->status.cart[index], pc->get_group_level(sd), pc->get_group_level(sd)) ) // untradeable item
continue;
sd->vending[i].index = index;