From 34a1a63f26ecc52c524183e6aa477ebfc5dab904 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 24 Apr 2007 19:33:37 +0000 Subject: - NPC_MAGICALATTACK now starts a state similar to Sacrificial Ritual, in the sense that every normal attack afterwards becomes a Magical Attack. The skill duration is 15 secs. - Corrected some trade-cancel calls in trade_traderequest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10346 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/trade.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/trade.c') diff --git a/src/map/trade.c b/src/map/trade.c index 40f63e888..41d919daa 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -54,7 +54,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta } if ((target_sd->trade_partner != 0) || (sd->trade_partner != 0)) { - trade_tradecancel(sd); // person is in another trade + clif_tradestart(sd, 2); // person is in another trade return; } @@ -62,7 +62,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta if ( pc_can_give_items(level) || pc_can_give_items(pc_isGM(target_sd)) ) //check if both GMs are allowed to trade { clif_displaymessage(sd->fd, msg_txt(246)); - trade_tradecancel(sd); // GM is not allowed to trade + clif_tradestart(sd, 2); // GM is not allowed to trade return; } -- cgit v1.2.3-60-g2f50