diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 0aac9918bb..d832bc25c6 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -8552,17 +8552,16 @@ void clif_mvp_exp( map_session_data& sd, t_exp exp ){ } -/// Dropped MVP item reward message (ZC_THROW_MVPITEM). -/// 010d +/// Dropped MVP item reward message. +/// 010d (ZC_THROW_MVPITEM) /// /// "You are the MVP, but cannot obtain the reward because you are overweight." -void clif_mvp_noitem(map_session_data* sd) -{ - int fd = sd->fd; +void clif_mvp_noitem( map_session_data& sd ){ + PACKET_ZC_THROW_MVPITEM packet{}; - WFIFOHEAD(fd,packet_len(0x10d)); - WFIFOW(fd,0) = 0x10d; - WFIFOSET(fd,packet_len(0x10d)); + packet.packetType = HEADER_ZC_THROW_MVPITEM; + + clif_send( &packet, sizeof( packet ), &sd.bl, SELF ); } diff --git a/src/map/clif.hpp b/src/map/clif.hpp index 6d5fbdc931..aa2940819f 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -993,7 +993,7 @@ void clif_item_skill(map_session_data *sd,uint16 skill_id,uint16 skill_lv); void clif_mvp_effect( map_session_data& sd ); void clif_mvp_item(map_session_data *sd, t_itemid nameid); void clif_mvp_exp( map_session_data& sd, t_exp exp ); -void clif_mvp_noitem(map_session_data* sd); +void clif_mvp_noitem( map_session_data& sd ); void clif_changed_dir(struct block_list *bl, enum send_target target); // vending diff --git a/src/map/clif_packetdb.hpp b/src/map/clif_packetdb.hpp index 825504c111..f11a8ae1f4 100644 --- a/src/map/clif_packetdb.hpp +++ b/src/map/clif_packetdb.hpp @@ -129,7 +129,6 @@ parseable_packet(0x0108,-1,clif_parse_PartyMessage,2,4); packet(0x0109,-1); packet( HEADER_ZC_MVP_GETTING_ITEM, sizeof( struct PACKET_ZC_MVP_GETTING_ITEM ) ); - packet(0x010d,2); packet(0x010e,11); packet(0x010f,-1); packet( HEADER_ZC_ACK_TOUSESKILL, sizeof( PACKET_ZC_ACK_TOUSESKILL ) ); diff --git a/src/map/packets.hpp b/src/map/packets.hpp index 57e993ddfd..50fb50da60 100644 --- a/src/map/packets.hpp +++ b/src/map/packets.hpp @@ -1112,6 +1112,11 @@ struct PACKET_ZC_MVP_GETTING_SPECIAL_EXP { DEFINE_PACKET_HEADER(ZC_MVP_GETTING_SPECIAL_EXP, 0x10b); #endif +struct PACKET_ZC_THROW_MVPITEM { + int16 packetType; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_THROW_MVPITEM, 0x10d); + // 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 )