From e918e4d9a8a56cc6a0a653fa6398d731484496c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 21 Mar 2019 03:20:26 +0300 Subject: Add ZC_PING and CZ_PING packets For supported packet version, from now server send ping packets to client. --- src/map/packets.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/map/packets.h') diff --git a/src/map/packets.h b/src/map/packets.h index 50784f09a..279c19d93 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -1931,4 +1931,8 @@ packet(0x96e,clif->ackmergeitems); packet(0x0b12,clif->pNPCBarterClosed); #endif +#if PACKETVER_MAIN_NUM >= 20190403 || PACKETVER_RE_NUM >= 20190320 + packet(0x0b1c,clif->pPing); +#endif + #endif /* MAP_PACKETS_H */ -- cgit v1.2.3-70-g09d2 From 0a5ee140c74989d5fb2cbc9a22150ff66bbcfb07 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 29 Mar 2019 22:17:06 +0300 Subject: Add chat command /resetcooltime Add packet CZ_COOLDOWN_RESET. --- src/map/clif.c | 9 +++++++++ src/map/clif.h | 1 + src/map/packets.h | 5 +++++ src/map/packets_struct.h | 7 +++++++ 4 files changed, 22 insertions(+) (limited to 'src/map/packets.h') diff --git a/src/map/clif.c b/src/map/clif.c index 85e1a192b..605362fc5 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -22193,6 +22193,14 @@ static int clif_pingTimerSub(struct map_session_data *sd, va_list ap) return 0; } +static void clif_parse_ResetCooldown(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); +static void clif_parse_ResetCooldown(int fd, struct map_session_data *sd) +{ + char cmd[15]; + sprintf(cmd,"%ccddebug reset", atcommand->at_symbol); + atcommand->exec(fd, sd, cmd, true); +} + /*========================================== * Main client packet processing function *------------------------------------------*/ @@ -23386,4 +23394,5 @@ void clif_defaults(void) clif->ping = clif_ping; clif->pingTimer = clif_pingTimer; clif->pingTimerSub = clif_pingTimerSub; + clif->pResetCooldown = clif_parse_ResetCooldown; } diff --git a/src/map/clif.h b/src/map/clif.h index a9413465b..241214e8b 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -1585,6 +1585,7 @@ struct clif_interface { void (*ping) (struct map_session_data *sd); int (*pingTimer) (int tid, int64 tick, int id, intptr_t data); int (*pingTimerSub) (struct map_session_data *sd, va_list ap); + void (*pResetCooldown) (int fd, struct map_session_data *sd); }; #ifdef HERCULES_CORE diff --git a/src/map/packets.h b/src/map/packets.h index 279c19d93..bf80d96c7 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -1798,6 +1798,11 @@ packet(0x96e,clif->ackmergeitems); packet(0x0a77,clif->pCameraInfo); // CZ_CAMERA_INFO #endif +// all 20160622+ +#if PACKETVER >= 20160622 + packet(0x0a88,clif->pResetCooldown); +#endif + // 2017-02-28aRagexeRE #if PACKETVER >= 20170228 // new packets diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index b12193997..109532c3e 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3174,6 +3174,13 @@ struct PACKET_ZC_PING { DEFINE_PACKET_HEADER(ZC_PING, 0x0b1d); #endif +#if PACKETVER >= 20160622 +struct PACKET_CZ_COOLDOWN_RESET { + int16 packetType; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(CZ_COOLDOWN_RESET, 0x0a88); +#endif + #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) #endif // not NetBSD < 6 / Solaris -- cgit v1.2.3-70-g09d2 From e610e222c57c1268fce72bc9578b42f655c18545 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 6 Apr 2019 18:20:29 +0300 Subject: Add packet CZ_STYLE_CLOSE --- src/map/clif.c | 7 +++++++ src/map/clif.h | 1 + src/map/packets.h | 2 ++ src/map/packets_struct.h | 7 +++++++ 4 files changed, 17 insertions(+) (limited to 'src/map/packets.h') diff --git a/src/map/clif.c b/src/map/clif.c index 63ad55c3d..109f78553 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -21948,6 +21948,12 @@ static void clif_parse_cz_req_style_change2(int fd, struct map_session_data *sd) return; } +static void clif_parse_cz_style_close(int fd, struct map_session_data *sd) __attribute__((nonnull(2))); +static void clif_parse_cz_style_close(int fd, struct map_session_data *sd) +{ + // do nothing +} + static void clif_style_change_response(struct map_session_data *sd, enum stylist_shop flag) { #if PACKETVER >= 20151104 @@ -23386,6 +23392,7 @@ void clif_defaults(void) clif->pReqStyleChange = clif_parse_cz_req_style_change; clif->pReqStyleChange2 = clif_parse_cz_req_style_change2; + clif->pStyleClose = clif_parse_cz_style_close; clif->style_change_response = clif_style_change_response; clif->camera_showWindow = clif_camera_showWindow; diff --git a/src/map/clif.h b/src/map/clif.h index 55f7906c3..367e28449 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -1566,6 +1566,7 @@ struct clif_interface { void (*pReqStyleChange) (int fd, struct map_session_data *sd); void (*pReqStyleChange2) (int fd, struct map_session_data *sd); + void (*pStyleClose) (int fd, struct map_session_data *sd); void (*style_change_response) (struct map_session_data *sd, enum stylist_shop flag); void (*pPetEvolution) (int fd, struct map_session_data *sd); void (*petEvolutionResult) (int fd, enum pet_evolution_result result); diff --git a/src/map/packets.h b/src/map/packets.h index bf80d96c7..a0b6b7f4b 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -1777,8 +1777,10 @@ packet(0x96e,clif->ackmergeitems); #if PACKETVER >= 20151104 // new packets packet(0x0a46,clif->pReqStyleChange); + packet(0x0a48,clif->pStyleClose); #endif + // 2016-03-23aRagexeRE #if PACKETVER >= 20160323 // new packets diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 109532c3e..96337d32b 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3181,6 +3181,13 @@ struct PACKET_CZ_COOLDOWN_RESET { DEFINE_PACKET_HEADER(CZ_COOLDOWN_RESET, 0x0a88); #endif +#if PACKETVER >= 20151104 +struct PACKET_CZ_STYLE_CLOSE { + int16 packetType; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(CZ_STYLE_CLOSE, 0x0a48); +#endif + #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) #endif // not NetBSD < 6 / Solaris -- cgit v1.2.3-70-g09d2