summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-04-05 20:45:35 +0200
committerGitHub <noreply@github.com>2020-04-05 20:45:35 +0200
commit2ec19ccf9aad553de8e04ee463e820e70199e060 (patch)
treeb5b956e0159ce60a78710aae3e100dee12278ca0 /src/map/clif.c
parent08691e5027cfa602578fc5f4d064900881be5108 (diff)
parent533b332f5aac93a0fc6a7d73902d278b35f02918 (diff)
downloadhercules-2ec19ccf9aad553de8e04ee463e820e70199e060.tar.gz
hercules-2ec19ccf9aad553de8e04ee463e820e70199e060.tar.bz2
hercules-2ec19ccf9aad553de8e04ee463e820e70199e060.tar.xz
hercules-2ec19ccf9aad553de8e04ee463e820e70199e060.zip
Merge pull request #2663 from 4144/updatepackets
Update packets up to 2020-04-01
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index c9e018f73..a7d9c71e5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9710,6 +9710,7 @@ static void clif_unknownname_ack(int fd, struct block_list *bl)
{
nullpo_retv(bl);
ShowError("clif_blname_ack: bad type %u(%d)\n", bl->type, bl->id);
+ Assert_retv(0);
}
static void clif_blname_ack(int fd, struct block_list *bl)
@@ -20091,7 +20092,7 @@ static void clif_parse_cashShopOpen2(int fd, struct map_session_data *sd)
static void clif_cashShopOpen(int fd, struct map_session_data *sd, int tab)
{
-#if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || PACKETVER_ZERO_NUM >= defined(PACKETVER_ZERO)
+#if PACKETVER_MAIN_NUM >= 20101123 || PACKETVER_RE_NUM >= 20120328 || defined(PACKETVER_ZERO)
WFIFOHEAD(fd, sizeof(struct PACKET_ZC_SE_CASHSHOP_OPEN));
struct PACKET_ZC_SE_CASHSHOP_OPEN *p = WFIFOP(fd, 0);
p->packetType = HEADER_ZC_SE_CASHSHOP_OPEN;