Przeglądaj źródła

Converted ZC_MSG_VALUE to struct (#9058)

Atemo 3 miesięcy temu
rodzic
commit
115677a8f4
4 zmienionych plików z 18 dodań i 12 usunięć
  1. 9 10
      src/map/clif.cpp
  2. 1 1
      src/map/clif.hpp
  3. 7 0
      src/map/packets.hpp
  4. 1 1
      src/map/pc.cpp

+ 9 - 10
src/map/clif.cpp

@@ -10375,17 +10375,16 @@ void clif_msg( map_session_data& sd, e_clif_messages msg_id ){
 }
 
 
-/// Display msgstringtable.txt string and fill in a valid for %d format (ZC_MSG_VALUE).
-/// 0x7e2 <message>.W <value>.L
-void clif_msg_value(map_session_data* sd, uint16 id, int32 value)
-{
-	int32 fd = sd->fd;
+/// Display msgstringtable.txt string and fill in a valid for %d format.
+/// 0x7e2 <message>.W <value>.L (ZC_MSG_VALUE)
+void clif_msg_value( map_session_data& sd, e_clif_messages msg_id, int32 value ){
+	PACKET_ZC_MSG_VALUE p{};
 
-	WFIFOHEAD(fd, packet_len(0x7e2));
-	WFIFOW(fd,0) = 0x7e2;
-	WFIFOW(fd,2) = id;
-	WFIFOL(fd,4) = value;
-	WFIFOSET(fd, packet_len(0x7e2));
+	p.packetType = HEADER_ZC_MSG_VALUE;
+	p.message = msg_id;
+	p.value = value;
+
+	clif_send( &p, sizeof( p ), &sd.bl, SELF );
 }
 
 

+ 1 - 1
src/map/clif.hpp

@@ -1207,7 +1207,7 @@ void clif_viewequip_ack( map_session_data& sd, map_session_data& tsd );
 void clif_equipcheckbox( map_session_data& sd );
 
 void clif_msg( map_session_data& sd, e_clif_messages msg_id );
-void clif_msg_value(map_session_data* sd, uint16 id, int32 value);
+void clif_msg_value( map_session_data& sd, e_clif_messages msg_id, int32 value );
 void clif_msg_skill( map_session_data& sd, uint16 skill_id, e_clif_messages msg_id );
 void clif_msg_color( map_session_data& sd, e_clif_messages msg_id, uint32 color );
 

+ 7 - 0
src/map/packets.hpp

@@ -1925,6 +1925,13 @@ struct PACKET_ZC_MSG_SKILL {
 } __attribute__((packed));
 DEFINE_PACKET_HEADER(ZC_MSG_SKILL, 0x7e6);
 
+struct PACKET_ZC_MSG_VALUE {
+	int16 packetType;
+	uint16 message;
+	int32 value;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_MSG_VALUE, 0x7e2);
+
 // 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 )

+ 1 - 1
src/map/pc.cpp

@@ -14598,7 +14598,7 @@ uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, u
 	// Send reply of delay remains
 	if (sc->getSCE(id->delay.sc)) {
 		const struct TimerData *timer = get_timer(sc->getSCE(id->delay.sc)->timer);
-		clif_msg_value(sd, MSI_ITEM_REUSE_LIMIT_SECOND, (int32)(timer ? DIFF_TICK(timer->tick, tick) / 1000 : 99));
+		clif_msg_value( *sd, MSI_ITEM_REUSE_LIMIT_SECOND, (int32)(timer ? DIFF_TICK(timer->tick, tick) / 1000 : 99) );
 		return 1;
 	}