From b3523d70ebf3c69dc7f2410651be235bdac7232b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 13 Apr 2019 04:36:21 +0300
Subject: Fix packet version for pc name packet with title
---
src/map/clif.c | 4 ++--
src/map/packets_struct.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/map/clif.c b/src/map/clif.c
index b5b67c1f2..bd1198f44 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9276,7 +9276,7 @@ static void clif_pcname_ack(int fd, struct block_list *bl)
if (ssd->fakename[0] != '\0') {
memcpy(packet.name, ssd->fakename, NAME_LENGTH);
} else {
-#if PACKETVER >= 20150503
+#if PACKETVER_MAIN_NUM >= 20150225 || PACKETVER_RE_NUM >= 20141126 || defined(PACKETVER_ZERO)
// Title System [Dastgir/Hercules]
if (ssd->status.title_id > 0) {
packet.title_id = ssd->status.title_id;
@@ -9548,7 +9548,7 @@ static void clif_charnameupdate(struct map_session_data *ssd)
memcpy(packet.position_name, g->position[ps].name, NAME_LENGTH);
}
-#if PACKETVER >= 20150503
+#if PACKETVER_MAIN_NUM >= 20150225 || PACKETVER_RE_NUM >= 20141126 || defined(PACKETVER_ZERO)
// Achievement System [Dastgir/Hercules]
if (ssd->status.title_id > 0) {
packet.title_id = ssd->status.title_id;
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 07cc46770..ed31c6c59 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -418,7 +418,7 @@ enum packet_headers {
buyingStoreUpdateItemType = 0x81b,
#endif
reqName = 0x95,
-#if PACKETVER >= 20150503 // Confirm this?
+#if PACKETVER_MAIN_NUM >= 20150225 || PACKETVER_RE_NUM >= 20141126 || defined(PACKETVER_ZERO)
reqNameAllType = 0xA30,
#else
reqNameAllType = 0x195,
@@ -2794,8 +2794,8 @@ struct packet_reqnameall_ack {
char party_name[NAME_LENGTH];
char guild_name[NAME_LENGTH];
char position_name[NAME_LENGTH];
-#if PACKETVER >= 20150503 // Confirm this?
- int32 title_id; // Achievement Title
+#if PACKETVER_MAIN_NUM >= 20150225 || PACKETVER_RE_NUM >= 20141126 || defined(PACKETVER_ZERO)
+ int32 title_id;
#endif
} __attribute__((packed));
--
cgit v1.2.3-70-g09d2