diff options
| author | shennetsind <ind@henn.et> | 2013-03-30 23:08:08 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-03-30 23:08:08 -0300 |
| commit | 7ec1e8fdff6adad1979d750774f9003f223bf3ef (patch) | |
| tree | 65553e83135c5f5f983c106914d0a35ea2f62588 /src/map/trade.c | |
| parent | 87373047cd4aaf8b0c2425133b9b907e3ea4d122 (diff) | |
| download | hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.gz hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.bz2 hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.tar.xz hercules-7ec1e8fdff6adad1979d750774f9003f223bf3ef.zip | |
Hercules Renewal: clif.c complete
Added the last missing functions into the interface, all functions in clif.c are now wired to the interface.
http://hercules.ws/board/topic/237-hercules-renewal/
Also shortened clif->displaymessage to clif->message, removed the old clif->message and merged its functionality with clif->disp_overhead (both use the same packet and do the same thing :P)
-
and a gazillion other stuff:
http://hercules.ws/board/topic/316-introducing-hercules-channel-system/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/trade.c')
| -rw-r--r-- | src/map/trade.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index a8174be97..0b9609322 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -32,7 +32,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta nullpo_retv(sd); if (map[sd->bl.m].flag.notrade) { - clif->displaymessage (sd->fd, msg_txt(272)); + clif->message (sd->fd, msg_txt(272)); return; //Can't trade in notrade mapflag maps. } @@ -71,7 +71,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->displaymessage(sd->fd, msg_txt(246)); + clif->message(sd->fd, msg_txt(246)); clif->tradestart(sd, 2); // GM is not allowed to trade return; } @@ -356,14 +356,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->displaymessage (sd->fd, msg_txt(260)); + clif->message (sd->fd, msg_txt(260)); clif->tradeitemok(sd, index+2, 1); return; } if( item->expire_time ) { // Rental System - clif->displaymessage (sd->fd, msg_txt(260)); + clif->message (sd->fd, msg_txt(260)); clif->tradeitemok(sd, index+2, 1); return; } |