summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-15 18:36:22 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-15 18:36:22 +0000
commitc504f823250938f711341565763eef58827af4a6 (patch)
tree3fed6213fe35eca75ee0fefc701b6c768d2e4491
parentdbe06dcb0d692931645463958ef21c1008717d89 (diff)
downloadhercules-c504f823250938f711341565763eef58827af4a6.tar.gz
hercules-c504f823250938f711341565763eef58827af4a6.tar.bz2
hercules-c504f823250938f711341565763eef58827af4a6.tar.xz
hercules-c504f823250938f711341565763eef58827af4a6.zip
* Fixed canceling item appraisal window (Magnifier and Identify) would prevent players from using any follow up skills (bugreport:4809, since r14545).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14745 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/clif.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6b3d6f145..837772c14 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/03/15
+ * Fixed canceling item appraisal window (Magnifier and Identify) would prevent players from using any follow up skills (bugreport:4809, since r14545). [Ai4rei]
* Fixed monsters getting warped when stepping on an NPC warp when at least one of the bits of setting 'mob_warp' was set (bugreport:4766, since r12757). [Ai4rei]
2011/03/14
* Fixed a typo in npc_touchnext_areanpc (NPC's map being used as it's x-coordinate), which caused ::OnTouch_ invokation to affect different area than intended (bugreport:4814, since r14097). [Ai4rei]
diff --git a/src/map/clif.c b/src/map/clif.c
index 960a63c0e..40e6d9b71 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10265,6 +10265,7 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd)
return;
if( idx == -1 )
{// cancel pressed
+ sd->menuskill_val = sd->menuskill_id = 0;
return;
}
skill_identify(sd,idx-2);