|
@@ -12320,7 +12320,9 @@ void clif_parse_skill_toid( struct map_session_data* sd, uint16 skill_id, uint16
|
|
if( sd->menuskill_id ) {
|
|
if( sd->menuskill_id ) {
|
|
if( sd->menuskill_id == SA_TAMINGMONSTER ) {
|
|
if( sd->menuskill_id == SA_TAMINGMONSTER ) {
|
|
clif_menuskill_clear(sd); //Cancel pet capture.
|
|
clif_menuskill_clear(sd); //Cancel pet capture.
|
|
- } else if( sd->menuskill_id != SA_AUTOSPELL )
|
|
|
|
|
|
+ }else if( sd->menuskill_id == SG_FEEL ){
|
|
|
|
+ clif_menuskill_clear( sd ); // Cancel selection
|
|
|
|
+ }else if( sd->menuskill_id != SA_AUTOSPELL )
|
|
return; //Can't use skills while a menu is open.
|
|
return; //Can't use skills while a menu is open.
|
|
}
|
|
}
|
|
|
|
|
|
@@ -12428,6 +12430,8 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
|
|
if( sd->menuskill_id ) {
|
|
if( sd->menuskill_id ) {
|
|
if( sd->menuskill_id == SA_TAMINGMONSTER ) {
|
|
if( sd->menuskill_id == SA_TAMINGMONSTER ) {
|
|
clif_menuskill_clear(sd); //Cancel pet capture.
|
|
clif_menuskill_clear(sd); //Cancel pet capture.
|
|
|
|
+ }else if( sd->menuskill_id == SG_FEEL ){
|
|
|
|
+ clif_menuskill_clear( sd ); // Cancel selection
|
|
} else if( sd->menuskill_id != SA_AUTOSPELL )
|
|
} else if( sd->menuskill_id != SA_AUTOSPELL )
|
|
return; //Can't use skills while a menu is open.
|
|
return; //Can't use skills while a menu is open.
|
|
}
|
|
}
|