diff options
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 0eaab5ce3..a3360b76a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9707,8 +9707,12 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) { target_id = sd->bl.id; if(sd->menuskill_id) - return; //Can't use skills while a menu is open. - + { + if (sd->menuskill_id == SA_TAMINGMONSTER) + sd->menuskill_id = sd->menuskill_lv = 0; //Cancel pet capture. + else + return; //Can't use skills while a menu is open. + } if (sd->skillitem == skillnum) { if (skilllv != sd->skillitemlv) skilllv = sd->skillitemlv; @@ -9807,7 +9811,12 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, int skilll return; if(sd->menuskill_id) - return; //Can't use skills while a menu is open. + { + if (sd->menuskill_id == SA_TAMINGMONSTER) + sd->menuskill_id = sd->menuskill_lv = 0; //Cancel pet capture. + else + return; //Can't use skills while a menu is open. + } pc_delinvincibletimer(sd); |