diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 14:42:08 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 14:42:08 +0000 |
| commit | e53a0dc7cb588a1e0ec85afb87c402e30dc3773b (patch) | |
| tree | 301835b01ce8cba9c8b1d34e655a77b310c05f93 /src/map/clif.c | |
| parent | 3f19df2cb549db3635e6638285b39d66f507616c (diff) | |
| download | hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.gz hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.bz2 hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.xz hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.zip | |
- 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
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 13 |
1 files changed, 10 insertions, 3 deletions
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){
|