diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 22:40:57 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 22:40:57 -0200 |
| commit | b1f7e524a79ce3e7afd64becaa7657c71d59f18f (patch) | |
| tree | 3d0f808a23cb1ead6cc0811542ac4263643203dc /src/map/buyingstore.c | |
| parent | 47401a4195c58e14f12200f1ba6aeb34ecd87df7 (diff) | |
| parent | 6be40f56a21e48505baa4ff69acc198aa6206bf1 (diff) | |
| download | hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.gz hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.bz2 hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.tar.xz hercules-b1f7e524a79ce3e7afd64becaa7657c71d59f18f.zip | |
Merge remote-tracking branch 'origin/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
conf/messages.conf
src/common/mmo.h
src/map/pc_groups.c
src/map/pc_groups.h
Diffstat (limited to 'src/map/buyingstore.c')
| -rw-r--r-- | src/map/buyingstore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c index 2a9e6a88e..44ece49c6 100644 --- a/src/map/buyingstore.c +++ b/src/map/buyingstore.c @@ -290,8 +290,8 @@ void buyingstore_trade(struct map_session_data* sd, int account_id, unsigned int return; } - if( sd->status.inventory[index].expire_time || !itemdb_cantrade(&sd->status.inventory[index], pc->get_group_level(sd), pc->get_group_level(pl_sd)) || memcmp(sd->status.inventory[index].card, buyingstore->blankslots, sizeof(buyingstore->blankslots)) ) - {// non-tradable item + if( sd->status.inventory[index].expire_time || (sd->status.inventory[index].bound && !pc->can_give_bounded_items(sd)) || !itemdb_cantrade(&sd->status.inventory[index], pc->get_group_level(sd), pc->get_group_level(pl_sd)) || memcmp(sd->status.inventory[index].card, buyingstore->blankslots, sizeof(buyingstore->blankslots)) ) + {// non-tradable item clif->buyingstore_trade_failed_seller(sd, BUYINGSTORE_TRADE_SELLER_FAILED, nameid); return; } |