1 files changed, 25 insertions, 8 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 1cd18b68d..817579e23 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11484,6 +11484,22 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd)
 	clif_menuskill_clear(sd);
 }
 
+///	Identifying item with right-click (CZ_REQ_ONECLICK_ITEMIDENTIFY).
+///	0A35 <index>.W
+void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd)
+{
+	int cmd = RFIFOW(fd,0);
+	short idx = RFIFOW(fd, packet_db[cmd].pos[0]) - 2;
+	int n;
+	
+	if (idx < 0 || idx >= MAX_INVENTORY || sd->inventory_data[idx] == NULL || sd->status.inventory[idx].nameid <= 0)
+		return;
+	
+	if ((n = pc->have_magnifier(sd) ) != INDEX_NOT_FOUND &&
+		pc->delitem(sd, n, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER) == 0)
+		skill->identify(sd, idx);
+}
+
 void clif_parse_SelectArrow(int fd,struct map_session_data *sd) __attribute__((nonnull (2)));
 /// Answer to arrow crafting item selection dialog (CZ_REQ_MAKINGARROW).
 /// 01ae <name id>.W
@@ -18729,21 +18745,21 @@ int clif_parse(int fd) {
 		if (RFIFOREST(fd) < 2)
 			return 0;
 
+		if (sd)
+			parse_cmd_func = sd->parse_cmd_func;
+		else
+			parse_cmd_func = clif->parse_cmd;
+
+		cmd = parse_cmd_func(fd,sd);
+
 		if (VECTOR_LENGTH(HPM->packets[hpClif_Parse]) > 0) {
-			int result = HPM->parse_packets(fd,hpClif_Parse);
+			int result = HPM->parse_packets(fd,cmd,hpClif_Parse);
 			if (result == 1)
 				continue;
 			if (result == 2)
 				return 0;
 		}
 
-		if( sd )
-			parse_cmd_func = sd->parse_cmd_func;
-		else
-			parse_cmd_func = clif->parse_cmd;
-
-		cmd = parse_cmd_func(fd,sd);
-
 		// filter out invalid / unsupported packets
 		if (cmd > MAX_PACKET_DB || cmd < MIN_PACKET_DB || packet_db[cmd].len == 0) {
 			ShowWarning("clif_parse: Received unsupported packet (packet 0x%04x (0x%04x), %"PRIuS" bytes received), disconnecting session #%d.\n",
@@ -19707,4 +19723,5 @@ void clif_defaults(void) {
 	clif->add_random_options = clif_add_random_options;
 	clif->pHotkeyRowShift = clif_parse_HotkeyRowShift;
 	clif->dressroom_open = clif_dressroom_open;
+	clif->pOneClick_ItemIdentify = clif_parse_OneClick_ItemIdentify;
 }