summaryrefslogtreecommitdiff
path: root/src/map/trade.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 22:40:57 -0200
committershennetsind <ind@henn.et>2013-11-06 22:40:57 -0200
commitb1f7e524a79ce3e7afd64becaa7657c71d59f18f (patch)
tree3d0f808a23cb1ead6cc0811542ac4263643203dc /src/map/trade.c
parent47401a4195c58e14f12200f1ba6aeb34ecd87df7 (diff)
parent6be40f56a21e48505baa4ff69acc198aa6206bf1 (diff)
downloadhercules-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/trade.c')
-rw-r--r--src/map/trade.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 8dd30371b..7085fdda3 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -365,6 +365,12 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount)
return;
}
+ if( ((item->bound == 1 || item->bound > 2) || (item->bound == 2 && sd->status.guild_id != target_sd->status.guild_id)) && !pc->can_give_bounded_items(sd) ) { // Item Bound
+ clif->message(sd->fd, msg_txt(293));
+ clif->tradeitemok(sd, index+2, 1);
+ return;
+ }
+
//Locate a trade position
ARR_FIND( 0, 10, trade_i, sd->deal.item[trade_i].index == index || sd->deal.item[trade_i].amount == 0 );
if( trade_i == 10 ) //No space left