diff options
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 09b2d4623..8025f7014 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9889,22 +9889,21 @@ void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd) { */ void clif_parse_UseSkillMap(int fd,struct map_session_data *sd) { + int skill_num; RFIFOHEAD(fd); + skill_num = RFIFOW(fd,2); - if (clif_cant_act(sd)) + if(skill_num != sd->menuskill_id) return; - if(sd->sc.option&(OPTION_WEDDING|OPTION_XMAS)) + if (clif_cant_act(sd)) + { + sd->menuskill_id = sd->menuskill_lv = 0; return; - - if(sd->menuskill_id && - sd->menuskill_id != RFIFOW(fd,2) && - sd->menuskill_id != SA_AUTOSPELL) - return; //Can't use skills while a menu is open. + } pc_delinvincibletimer(sd); - - skill_castend_map(sd,RFIFOW(fd,2),(char*)RFIFOP(fd,4)); + skill_castend_map(sd,skill_num,(char*)RFIFOP(fd,4)); } /*========================================== * ƒƒ‚—v‹ |