From 97894a627a241cf5f39e85eb7433faaecf2431b5 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sat, 25 Jan 2020 23:45:39 +0100 Subject: [PATCH] Fixed SG_FEEL dialog cancel (#4566) Fixes #3535 Thanks to @anacondaq --- src/map/clif.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 898912b9b9..f9351db260 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -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 == SA_TAMINGMONSTER ) { 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. } @@ -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 == SA_TAMINGMONSTER ) { 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 ) return; //Can't use skills while a menu is open. }