diff options
author | Haru <haru@dotalux.com> | 2016-07-25 20:53:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-25 20:53:35 +0200 |
commit | bc46ac94eba15b4f5159a7fa330c93907dad7d68 (patch) | |
tree | a4a824762dcea51b82e2816eff89f7db7b060656 /src/map/trade.c | |
parent | fee640a7170ec62b55c2eb1f13477326d9fe6428 (diff) | |
parent | 03ce9e5a69b54535ea70b3776004dd7ade7e6134 (diff) | |
download | hercules-bc46ac94eba15b4f5159a7fa330c93907dad7d68.tar.gz hercules-bc46ac94eba15b4f5159a7fa330c93907dad7d68.tar.bz2 hercules-bc46ac94eba15b4f5159a7fa330c93907dad7d68.tar.xz hercules-bc46ac94eba15b4f5159a7fa330c93907dad7d68.zip |
Merge pull request #1380 from EPuncker/messagesconf-update
Added a missing entry into messages.conf and added some comments wher…
Diffstat (limited to 'src/map/trade.c')
-rw-r--r-- | src/map/trade.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index 6352c3a4d..d6bdd14e5 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -51,8 +51,8 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta nullpo_retv(sd); if (map->list[sd->bl.m].flag.notrade) { - clif->message (sd->fd, msg_sd(sd,272)); - return; //Can't trade in notrade mapflag maps. + clif->message (sd->fd, msg_sd(sd,272)); // You can't trade in this map + return; } if (target_sd == NULL || sd == target_sd) { @@ -90,7 +90,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta if (!pc_can_give_items(sd) || !pc_can_give_items(target_sd)) //check if both GMs are allowed to trade { - clif->message(sd->fd, msg_sd(sd,246)); + clif->message(sd->fd, msg_sd(sd,246)); // Your GM level doesn't authorize you to perform this action. clif->tradestart(sd, 2); // GM is not allowed to trade return; } @@ -372,14 +372,14 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount) if( !itemdb_cantrade(item, src_lv, dst_lv) && //Can't trade (pc->get_partner(sd) != target_sd || !itemdb_canpartnertrade(item, src_lv, dst_lv)) ) //Can't partner-trade { - clif->message (sd->fd, msg_sd(sd,260)); + clif->message (sd->fd, msg_sd(sd,260)); // This item cannot be traded. clif->tradeitemok(sd, index+2, TIO_INDROCKS); return; } if( item->expire_time ) { // Rental System - clif->message (sd->fd, msg_sd(sd,260)); + clif->message (sd->fd, msg_sd(sd,260)); // This item cannot be traded. clif->tradeitemok(sd, index+2, TIO_INDROCKS); return; } @@ -388,7 +388,7 @@ void trade_tradeadditem(struct map_session_data *sd, short index, short amount) !( item->bound == IBT_GUILD && sd->status.guild_id == target_sd->status.guild_id ) && !( item->bound == IBT_PARTY && sd->status.party_id == target_sd->status.party_id ) && !pc_can_give_bound_items(sd) ) { - clif->message(sd->fd, msg_sd(sd,293)); + clif->message(sd->fd, msg_sd(sd,293)); // This bound item cannot be traded to that character. clif->tradeitemok(sd, index+2, TIO_INDROCKS); return; } |