瀏覽代碼

Converted CZ_REQ_ITEMCOMPOSITION_LIST to struct (#8998)

Lemongrass3110 3 月之前
父節點
當前提交
291a99ef6d
共有 3 個文件被更改,包括 18 次插入4 次删除
  1. 11 3
      src/map/clif.cpp
  2. 1 1
      src/map/clif_packetdb.hpp
  3. 6 0
      src/map/packets.hpp

+ 11 - 3
src/map/clif.cpp

@@ -13442,13 +13442,21 @@ void clif_parse_AutoSpell(int32 fd,map_session_data *sd)
 }
 
 
-/// Request to display item carding/composition list (CZ_REQ_ITEMCOMPOSITION_LIST).
-/// 017a <card index>.W
+/// Request to display item carding/composition list.
+/// 017a <card index>.W (CZ_REQ_ITEMCOMPOSITION_LIST)
 void clif_parse_UseCard(int32 fd,map_session_data *sd)
 {
 	if (sd->state.trading != 0)
 		return;
-	clif_use_card(sd,RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2);
+
+	const PACKET_CZ_REQ_ITEMCOMPOSITION_LIST* p = reinterpret_cast<PACKET_CZ_REQ_ITEMCOMPOSITION_LIST*>( RFIFOP( fd, 0 ) );
+	uint16 idx = server_index( p->index );
+
+	if( idx >= MAX_INVENTORY ){
+		return;
+	}
+
+	clif_use_card( sd, idx );
 }
 
 

+ 1 - 1
src/map/clif_packetdb.hpp

@@ -177,7 +177,7 @@
 	packet(0x0176,106);
 	packet(0x0177,-1);
 	parseable_packet( HEADER_CZ_REQ_ITEMIDENTIFY, sizeof( PACKET_CZ_REQ_ITEMIDENTIFY ), clif_parse_ItemIdentify, 0 );
-	parseable_packet(0x017a,4,clif_parse_UseCard,2);
+	parseable_packet( HEADER_CZ_REQ_ITEMCOMPOSITION_LIST, sizeof( PACKET_CZ_REQ_ITEMCOMPOSITION_LIST ), clif_parse_UseCard, 0 );
 	packet(0x017b,-1);
 	parseable_packet(0x017c,6,clif_parse_InsertCard,2,4);
 	parseable_packet(0x017e,-1,clif_parse_GuildMessage,2,4);

+ 6 - 0
src/map/packets.hpp

@@ -1815,6 +1815,12 @@ struct PACKET_CZ_SELECTAUTOSPELL{
 } __attribute__((packed));
 DEFINE_PACKET_HEADER(CZ_SELECTAUTOSPELL, 0x1ce);
 
+struct PACKET_CZ_REQ_ITEMCOMPOSITION_LIST{
+	int16 packetType;
+	uint16 index;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_REQ_ITEMCOMPOSITION_LIST, 0x17a);
+
 // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #if !defined( sun ) && ( !defined( __NETBSD__ ) || __NetBSD_Version__ >= 600000000 )
 	#pragma pack( pop )