Преглед на файлове

Converted ZC_NOTIFY_TIME to struct (#9060)

Atemo преди 3 месеца
родител
ревизия
02514862d4
променени са 3 файла, в които са добавени 15 реда и са изтрити 11 реда
  1. 9 10
      src/map/clif.cpp
  2. 0 1
      src/map/clif_packetdb.hpp
  3. 6 0
      src/map/packets.hpp

+ 9 - 10
src/map/clif.cpp

@@ -11165,16 +11165,15 @@ void clif_parse_LoadEndAck(int32 fd,map_session_data *sd)
 }
 
 
-/// Server's tick (ZC_NOTIFY_TIME).
-/// 007f <time>.L
-void clif_notify_time(map_session_data* sd, t_tick time)
-{
-	int32 fd = sd->fd;
+/// Server's tick.
+/// 007f <time>.L (ZC_NOTIFY_TIME)
+void clif_notify_time( map_session_data& sd, t_tick time ){
+	PACKET_ZC_NOTIFY_TIME p{};
 
-	WFIFOHEAD(fd,packet_len(0x7f));
-	WFIFOW(fd,0) = 0x7f;
-	WFIFOL(fd,2) = client_tick(time);
-	WFIFOSET(fd,packet_len(0x7f));
+	p.packetType = HEADER_ZC_NOTIFY_TIME;
+	p.time = client_tick(time);
+
+	clif_send( &p, sizeof( p ), &sd.bl, SELF );
 }
 
 
@@ -11187,7 +11186,7 @@ void clif_parse_TickSend(int32 fd, map_session_data *sd)
 	// TODO: shuffle packet
 	sd->client_tick = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 
-	clif_notify_time(sd, gettick());
+	clif_notify_time( *sd, gettick() );
 }
 
 

+ 0 - 1
src/map/clif_packetdb.hpp

@@ -31,7 +31,6 @@
 	packet(0x007c,41);
 	parseable_packet(0x007d,2,clif_parse_LoadEndAck,0);
 	parseable_packet(0x007e,6,clif_parse_TickSend,2);
-	packet(0x007f,6);
 	packet(0x0082,2);
 	packet(0x0083,2);
 	packet(0x0084,2);

+ 6 - 0
src/map/packets.hpp

@@ -1939,6 +1939,12 @@ struct PACKET_ZC_NOTIFY_MANNER_POINT_GIVEN {
 } __attribute__((packed));
 DEFINE_PACKET_HEADER(ZC_NOTIFY_MANNER_POINT_GIVEN, 0x14b);
 
+struct PACKET_ZC_NOTIFY_TIME {
+	int16 packetType;
+	uint32 time;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_NOTIFY_TIME, 0x7f);
+
 // 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 )