From e53a0dc7cb588a1e0ec85afb87c402e30dc3773b Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 9 Aug 2006 14:42:08 +0000 Subject: - Trade requests will now fail when either character is unable to act (character in storage, vending, interacting with an npc, petrified, etc) - Change the default of attack_attr_none to all classes except players. This means that pet/mobs/homun will always do normal attacks with no-element modifiers (but elemental reduction cards still apply) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8207 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 7ada8fceb..00113eaeb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9556,10 +9556,17 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) RFIFOHEAD(fd); t_sd = map_id2sd(RFIFOL(sd->fd,2)); - // @noask [LuzZza] - if(t_sd && t_sd->state.noask) { - clif_noask_sub(sd, t_sd, 0); + if(clif_cant_act(sd)) return; + + // @noask [LuzZza] + if(t_sd) { + if (t_sd->state.noask) { + clif_noask_sub(sd, t_sd, 0); + return; + } + if(clif_cant_act(t_sd)) + return; } if(battle_config.basic_skill_check == 0 || pc_checkskill(sd,NV_BASIC) >= 1){ -- cgit v1.2.3-70-g09d2